merging safemode branch -r12658, return unit.h/.cpp changes back to pre-merge state.
Authored by: safemode 2010-02-27
Parent: [r12658]
Child: [r12660]