Merge branch 'ykiveish-master'
authorThomas Ingleby <thomas.c.ingleby@intel.com>
Thu, 5 Jun 2014 12:45:47 +0000 (13:45 +0100)
committerThomas Ingleby <thomas.c.ingleby@intel.com>
Thu, 5 Jun 2014 12:45:47 +0000 (13:45 +0100)

Trivial merge