Merge branch 'bugzilla-16396' into release
authorLen Brown <len.brown@intel.com>
Sun, 25 Jul 2010 03:26:22 +0000 (23:26 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 25 Jul 2010 03:26:22 +0000 (23:26 -0400)

Trivial merge