Refactoring after moving of two classes
Authored by: hotzst 2010-01-20
Parent: [r2923]
Child: [r2925]