Refactoring to better structured code to make more reusable
Authored by: hotzst 2009-08-07
Parent: [r1798]
Child: [r1800]