Merge branch 'master' of ssh://source/srv/source.djpig.de/git/packages
authorFrank Lichtenheld <frank@lichtenheld.de>
Fri, 12 Oct 2007 01:54:57 +0000 (03:54 +0200)
committerFrank Lichtenheld <frank@lichtenheld.de>
Fri, 12 Oct 2007 01:54:57 +0000 (03:54 +0200)

Trivial merge