Merge commit 'v2_1_2' into debian
authorGerfried Fuchs <rhonda@debian.at>
Thu, 2 Oct 2008 10:49:50 +0000 (12:49 +0200)
committerGerfried Fuchs <rhonda@debian.at>
Thu, 2 Oct 2008 10:49:50 +0000 (12:49 +0200)

Trivial merge