0.12dev: Merged [8316] from 0.11-stable.
Authored by: rblank 2009-06-26
Parent: [r8316]
Child: [r8318]