Pull bugzilla-9429 into release branch
authorLen Brown <len.brown@intel.com>
Sun, 2 Dec 2007 19:33:33 +0000 (14:33 -0500)
committerLen Brown <len.brown@intel.com>
Sun, 2 Dec 2007 19:33:33 +0000 (14:33 -0500)

Trivial merge