0.12-stable: Merged [9963-9998] from 0.11-stable.
Authored by: rblank 2010-08-11
Parent: [r9998]
Child: [r10000]