Merge branches 'bugzilla-14207' and 'idle' into release
authorLen Brown <len.brown@intel.com>
Tue, 23 Feb 2010 05:19:48 +0000 (00:19 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 23 Feb 2010 05:19:48 +0000 (00:19 -0500)

Trivial merge