Merge branch 'idle' into elflink
authorMatt Fleming <matt.fleming@intel.com>
Wed, 3 Jul 2013 21:28:43 +0000 (22:28 +0100)
committerMatt Fleming <matt.fleming@intel.com>
Wed, 3 Jul 2013 21:28:43 +0000 (22:28 +0100)

Trivial merge