Merge branch 'refs/heads/master' of ssh://sreichholf@scm.schwerkraft.elitedvb.net...
authorsreichholf <stephan@reichholf.net>
Sat, 5 Feb 2011 15:00:21 +0000 (16:00 +0100)
committersreichholf <stephan@reichholf.net>
Sat, 5 Feb 2011 15:00:21 +0000 (16:00 +0100)

Trivial merge