merging trunk -r12706 to safemode branch
Authored by: safemode 2010-03-12
Parent: [r12706]
Child: [r12708]