Merge branch 'tingleby-master'
authorBrendan Le Foll <brendan.le.foll@intel.com>
Tue, 6 May 2014 08:33:46 +0000 (09:33 +0100)
committerBrendan Le Foll <brendan.le.foll@intel.com>
Tue, 6 May 2014 08:33:46 +0000 (09:33 +0100)

Trivial merge