Refactoring to reduce the use of depricated API
Authored by: hotzst 2010-02-03
Parent: [r2998]
Child: [r3000]