0.12dev: merge [9265] from 0.11-stable
Authored by: ecarter 2010-02-24
Parent: [r9265]
Child: [r9267]