Reverted r12385 as the bieri_gui branch was not quite ready for merging.
The command used was: svn merge -r12385:12384 .
..... r12385 | bugman | 2011-01-20 19:29:47 +0100 (Thu, 20 Jan 2011) | 3 lines Changed paths: M /1.3 Initialized merge tracking via "svnmerge" with revisions "1-9870" from svn+ssh://bugman@.../svn/relax/branches/bieri_gui .....
Authored by: bugman 2011-01-20
Parent: [r12386]
Child: [r12388]