merged from david, many thanks
authorMichael Vogt <michael.vogt@ubuntu.com>
Wed, 23 Sep 2009 15:11:41 +0000 (17:11 +0200)
committerMichael Vogt <michael.vogt@ubuntu.com>
Wed, 23 Sep 2009 15:11:41 +0000 (17:11 +0200)
commitf7d6459db697c6dbba8e5d787a817e7721bfb577
treedf35974a4902758ad2e9e03720a463bc13bdefb4
parent73b1d4847befc0d3042b6689484e0f74667aba6e
parenta874991b8549397fb26c47bbf229854556a3fb60
merged from david, many thanks