merged from debian-sid
authorMichael Vogt <michael.vogt@ubuntu.com>
Thu, 18 Nov 2010 09:15:29 +0000 (10:15 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Thu, 18 Nov 2010 09:15:29 +0000 (10:15 +0100)
commit2b6b0d1938ba4c8cd1293c63d94bca8d63d54460
tree87ddfb4bf68598b09f7862ed240fa2a4c148573e
parent58a642755c63cde3cf377d3719d66add27b13d65
parentba428c1dbd379036b0ced20ef54446f6155006f9
merged from debian-sid