Merge branch 'master' of ssh://woller-gui.git.sourceforge.net/gitroot/woller-gui...
authorIlkka Tengvall <ilkka.tengvall@iki.fi>
Tue, 13 Jul 2010 18:26:12 +0000 (21:26 +0300)
committerIlkka Tengvall <ilkka.tengvall@iki.fi>
Tue, 13 Jul 2010 18:26:12 +0000 (21:26 +0300)

Trivial merge