Merge branch 'osc' into release
authorLen Brown <[email protected]>
Wed, 16 Dec 2009 19:07:29 +0000 (14:07 -0500)
committerLen Brown <[email protected]>
Wed, 16 Dec 2009 19:07:29 +0000 (14:07 -0500)

Trivial merge