Merge branch 'master' of ssh://marmaro.de:2022/var/git/mmh
authormarkus schnalke <meillo@marmaro.de>
Wed, 11 Apr 2012 09:24:33 +0000 (11:24 +0200)
committermarkus schnalke <meillo@marmaro.de>
Wed, 11 Apr 2012 09:24:33 +0000 (11:24 +0200)

Trivial merge