0.12dev: Merged [8343] from 0.11-stable.
Authored by: osimons 2009-07-01
Parent: [r8343]
Child: [r8345]