Merge branch 'pnp' into release
authorLen Brown <len.brown@intel.com>
Wed, 30 Apr 2008 17:59:05 +0000 (13:59 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 30 Apr 2008 17:59:05 +0000 (13:59 -0400)

Trivial merge