Import code cleanup.
Signed-off-by: Jenny Steele jsteele@geek.net
Authored by: Jenny Steele 2011-06-03
Parent(s): [7d45bf]
Child(ren): [69e4a1]