Fix for the import order and whitespace.
Authored by: bugman 2011-07-01
Parent: [r13363]
Child: [r13365]