relax SVN archive

The command used was:
svn merge -r13466:13465 .

.....
r13466 | bugman | 2011-07-07 09:33:58 +0200 (Thu, 07 Jul 2011) | 3 lines
Changed paths:
M /branches/gui_testing/gui/wizard.py

The wizard is now a frame rather than dialog, as this gives better focus properties.
.....