0.12dev: Merged [8857] from 0.11-stable and prevented [8856] from being merged.
Authored by: rblank 2009-11-26
Parent: [r8857]
Child: [r8859]