Merge branch 'cleanup' into release
authorLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:13:21 +0000 (02:13 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 25 Oct 2010 06:13:21 +0000 (02:13 -0400)

Trivial merge