0.12dev: Merged [7564] from 0.11-stable.
Authored by: rblank 2008-09-28
Parent: [r7564]
Child: [r7566]