Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages
authorFrank Lichtenheld <frank@lichtenheld.de>
Tue, 18 Sep 2007 16:00:34 +0000 (18:00 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Tue, 18 Sep 2007 16:00:34 +0000 (18:00 +0200)

Trivial merge