Refactoring after the moving of two classes
Authored by: hotzst 2010-01-21
Parent: [r2934]
Child: [r2936]