Merge branch 'osc-bugfix' into release
authorLen Brown <len.brown@intel.com>
Wed, 20 Jan 2010 06:23:18 +0000 (01:23 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 20 Jan 2010 06:23:18 +0000 (01:23 -0500)

Trivial merge