Correct use of the appropriate classes
Authored by: hotzst 2009-09-29
Parent: [r2475]
Child: [r2477]