Pull bug3410 into release branch
authorLen Brown <len.brown@intel.com>
Fri, 23 Dec 2005 03:26:10 +0000 (22:26 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 23 Dec 2005 03:26:10 +0000 (22:26 -0500)

Trivial merge