Some fixes for an imperfect merger of the gui_testing branch at r14419.
Authored by: bugman 2011-08-24
Parent: [r14422]
Child: [r14424]