Merge branch 'master' of git+ssh://repo.or.cz/srv/git/Worg
authorCarsten Dominik <carsten.dominik@gmail.com>
Sat, 3 Apr 2010 06:53:17 +0000 (08:53 +0200)
committerCarsten Dominik <carsten.dominik@gmail.com>
Sat, 3 Apr 2010 06:53:17 +0000 (08:53 +0200)

Trivial merge