Added some missing imports and fixed an incorrectly named function call.
Authored by: bugman 2008-04-25
Parent: [r6007]
Child: [r6009]