merging trunk -r12715 back to safemode branch
Authored by: safemode 2010-03-13
Parent: [r12715]
Child: [r12717]