Rearrangement of the import statements.
Authored by: bugman 2011-06-09
Parent: [r12915]
Child: [r12917]
