Merge branch 'ykiveish-master'
authorBrendan Le Foll <brendan.le.foll@intel.com>
Wed, 28 May 2014 13:20:52 +0000 (14:20 +0100)
committerBrendan Le Foll <brendan.le.foll@intel.com>
Wed, 28 May 2014 13:21:01 +0000 (14:21 +0100)
Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

Trivial merge