cleaned up some imports to accord with coding guide
Authored by: jdh2358 2008-06-03
Parent: [r5374]
Child: [r5376]