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)
commitb4cdd6ac4f9b73118542a5c4e796e6b9f287d0dd
treea608b513f270f32bfd914834b49b55cb3778721d
parent2984397a02caa687fc81f8b8a02244e39e61cf50
parent6a4e2b7503d1f630bface040cf0f5a7aac1fabdb
Merge branch 'osc-bugfix' into release