Reverted r13986 as this was causing the main window to be poorly placed on screen on Mac OS X.
The command used was: svn merge -r13986:13985 .
Authored by: bugman 2011-07-29
Parent: [r13986]
Child: [r13988]
