Merge svn trunk -r12727 to safemode branch
Authored by: safemode 2010-03-16
Parent: [r12728]
Child: [r12730]