Merge from Debian
authorJoerg Jaspert <joerg@debian.org>
Sun, 18 May 2008 10:49:46 +0000 (12:49 +0200)
committerJoerg Jaspert <joerg@debian.org>
Sun, 18 May 2008 10:49:46 +0000 (12:49 +0200)
commitdf2513d8d7f4a2094790a7674eedbf34f46bbf0b
tree088db5af378ec7ba98ee7e0a6d14613f08c1acc6
parent88a19a6e47a1c577474311d016ae5d26a72a4029
parent1333fb1293beba4cf4e5e229055b1872eba8f3c8
Merge from Debian