Merge branch 'ykiveish-master'
authorBrendan Le Foll <brendan.le.foll@intel.com>
Fri, 6 Jun 2014 14:14:53 +0000 (15:14 +0100)
committerBrendan Le Foll <brendan.le.foll@intel.com>
Fri, 6 Jun 2014 14:14:53 +0000 (15:14 +0100)

Trivial merge