Pull bugzilla-3241 into release branch
authorLen Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:21:26 +0000 (17:21 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 1 Jul 2006 21:21:26 +0000 (17:21 -0400)

Trivial merge