Merge branch 'bugzilla-15100' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:58:51 +0000 (04:58 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:58:51 +0000 (04:58 -0500)

Trivial merge