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

Trivial merge