Merge branch 'osc-bugfix' into release

This commit is contained in:
Len Brown 2010-01-20 01:23:18 -05:00
commit b4cdd6ac4f