Merge branch 'bugzilla-9761' into release
authorLen Brown <len.brown@intel.com>
Fri, 20 Jun 2008 06:47:16 +0000 (02:47 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 20 Jun 2008 06:47:16 +0000 (02:47 -0400)

Trivial merge