Minor tidy of whitespace and extra import
Authored by: kylev 2009-02-28
Parent: [r606]
Child: [r608]