Reverted the temporary r11010 for testing the merging of the bieri_gui branch.
The command used was: svn merge -r11010:r11009 .
Authored by: bugman 2010-03-16
Parent: [r11012]
Child: [r11014]
