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)
commit9933e52ba4bf69b14908f2d76a3e083d51ed9df6
treea5a48c2de1b7d32a8751c9003e36974f9b75510d
parentab610a555d860fd48269af15fae725e640489914
parent31b830bf9e90e0e9cc5116ac2bb9b0ff0787b6e6
Merge commit 'v2_1_2' into debian