merge from the debian-sid branch
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 2 Dec 2009 16:24:56 +0000 (17:24 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 2 Dec 2009 16:24:56 +0000 (17:24 +0100)
commitf3ceaca7a648f7d93fa88106910151e69f498801
treeb2bf899c035363fbc0b561f1006a787cb06527f0
parent5085e660679cdbb51783702898c42000d5db4fba
parent16d7341fce96b089aa2a1c241acd0a72209bcd7f
merge from the debian-sid branch