Pull bugzilla-9535 into release branch
authorLen Brown <len.brown@intel.com>
Sat, 12 Jan 2008 23:06:27 +0000 (18:06 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 12 Jan 2008 23:06:27 +0000 (18:06 -0500)

Trivial merge