Reverted r11231 as this is not the best way to control pymol.
The command used was: svn merge -r11231:11230 .
Authored by: bugman 2010-06-11
Parent: [r11231]
Child: [r11233]
