Merge branch 'ykiveish-master'
authorBrendan Le Foll <brendan.le.foll@intel.com>
Mon, 2 Jun 2014 10:47:56 +0000 (11:47 +0100)
committerBrendan Le Foll <brendan.le.foll@intel.com>
Mon, 2 Jun 2014 10:47:56 +0000 (11:47 +0100)

Trivial merge