merging trunk -r12739 to safemode branch
Authored by: safemode 2010-03-19
Parent: [r12739]
Child: [r12741]