Merge from Debian
authorJoerg Jaspert <joerg@debian.org>
Wed, 14 May 2008 23:02:17 +0000 (01:02 +0200)
committerJoerg Jaspert <joerg@debian.org>
Wed, 14 May 2008 23:02:17 +0000 (01:02 +0200)
commit983bd4b4e1ad50b3f68d042e0a90d9ab4efc4b6e
tree87de2b32d29e71688b7efda28a854a3215f7e2b3
parent85b5893ebe019e46eac616141b87d55f63730523
parent653566b328a70f1f4b765967d72660ebae44473e
Merge from Debian