0.12dev: Merged 8291 from 0.11-stable.
Authored by: rblank 2009-06-24
Parent: [r8291]
Child: [r8293]