Merging with safemode branch -r12700, typo fix, see safemode branch log for full message
Authored by: safemode 2010-03-10
Parent: [r12700]
Child: [r12702]