Pull button into release branch
authorLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 03:17:14 +0000 (23:17 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 03:17:14 +0000 (23:17 -0400)

Trivial merge