Merge branch 'master' of ssh://SebastianRose@repo.or.cz/srv/git/Worg
authorSebastian Rose, Hannover, Germany <sebastian_rose@gmx.de>
Sun, 24 May 2009 17:29:16 +0000 (19:29 +0200)
committerSebastian Rose, Hannover, Germany <sebastian_rose@gmx.de>
Sun, 24 May 2009 17:29:16 +0000 (19:29 +0200)

Trivial merge