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

Trivial merge