Merge branch 'osc' into release
Len Brown [Thu, 24 Dec 2009 06:16:35 +0000 (01:16 -0500)]

Trivial merge