Merging trunk -r12702 to safemode branch
Authored by: safemode 2010-03-12
Parent: [r12702]
Child: [r12704]