Import fixes for the change of r16366, whereby the gui.misc module was split up.
Authored by: bugman 2012-05-22
Parent: [r16366]
Child: [r16368]