Pull bugzilla-1641 into release branch
authorLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 02:19:05 +0000 (22:19 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 25 Aug 2007 02:19:05 +0000 (22:19 -0400)

Trivial merge