merging trank -r12669 to safemode branch
Authored by: safemode 2010-02-28
Parent: [r12669]
Child: [r12671]