Merge branch 'bugzilla-16422' into release
authorLen Brown <len.brown@intel.com>
Sun, 15 Aug 2010 03:57:32 +0000 (23:57 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 15 Aug 2010 03:57:32 +0000 (23:57 -0400)

Trivial merge