Import fixes and clean ups and addition of module docstrings.
Authored by: bugman 2008-10-15
Parent: [r7739]
Child: [r7741]
