Merge branch 'bugzilla-16244' into release
authorLen Brown <len.brown@intel.com>
Thu, 22 Jul 2010 22:18:05 +0000 (18:18 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 22 Jul 2010 22:18:05 +0000 (18:18 -0400)

Trivial merge