Merge branch 'ykiveish-master'
authorBrendan Le Foll <brendan.le.foll@intel.com>
Tue, 3 Jun 2014 11:00:56 +0000 (12:00 +0100)
committerBrendan Le Foll <brendan.le.foll@intel.com>
Tue, 3 Jun 2014 11:00:56 +0000 (12:00 +0100)

Trivial merge