Merge branches 'release' and 'bugzilla-9910' into release
authorLen Brown <len.brown@intel.com>
Sat, 9 Feb 2008 09:32:47 +0000 (04:32 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 9 Feb 2008 09:32:47 +0000 (04:32 -0500)

Trivial merge