Refactored after the moving of the file
Authored by: hotzst 2009-08-27
Parent: [r2136]
Child: [r2138]