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)
commit81278510c044283d0129d52bf2e7a4ec4c9353e0
tree30f6881f2bfe466d76dec4de914e167471786547
parentb26cbd09f18644486cee57e3d14234b83ae13f53
parent725fc4661c5dd168ba6be1bc6aadd1647ea1e1f1
Merge branch 'ykiveish-master'

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>