Merge branch 'reset' into release
authorLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:34:15 +0000 (02:34 -0400)
committerLen Brown <len.brown@intel.com>
Wed, 23 Mar 2011 06:34:15 +0000 (02:34 -0400)

Trivial merge