Merge commit 'v2.6.38' into release
authorLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:33:54 +0000 (02:33 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:33:54 +0000 (02:33 -0400)

Trivial merge