Merge branch 'wakeup-etc-rafael' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:55:46 +0000 (04:55 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:55:46 +0000 (04:55 -0500)

Trivial merge