Merge branch 'osc' into release
authorLen Brown <len.brown@intel.com>
Thu, 24 Dec 2009 06:16:35 +0000 (01:16 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 24 Dec 2009 06:16:35 +0000 (01:16 -0500)

Trivial merge