Merge from -common branch
authorJoerg Jaspert <joerg@debian.org>
Fri, 16 May 2008 18:56:53 +0000 (20:56 +0200)
committerJoerg Jaspert <joerg@debian.org>
Fri, 16 May 2008 18:56:53 +0000 (20:56 +0200)
commita9ebb6f2afbf0fbc0e94ab73726dedb6a8ae5d75
tree0c15a3cb3504e7edfab99b6f32c30c372b196a22
parent1ba7b146120731981260a8fcab09fc0c67eb088b
parent0050d73a0bc648610b072c3a82a7bae0241d869c
Merge from -common branch