0.12dev: Some more import cleanup by Felix Schwarz.
Closes #8717.
Authored by: rblank 2009-10-03
Parent: [r8637]
Child: [r8639]