Merge commit 'v2_1_1' into debian
authorGerfried Fuchs <rhonda@debian.at>
Wed, 6 Aug 2008 21:38:29 +0000 (18:38 -0300)
committerGerfried Fuchs <rhonda@debian.at>
Wed, 6 Aug 2008 21:38:29 +0000 (18:38 -0300)

Trivial merge