merging trunk -r12710 to safemode branch
Authored by: safemode 2010-03-13
Parent: [r12710]
Child: [r12712]