merged from debian-experimental2
authorMichael Vogt <michael.vogt@ubuntu.com>
Mon, 16 Jan 2012 21:17:23 +0000 (22:17 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Mon, 16 Jan 2012 21:17:23 +0000 (22:17 +0100)

Trivial merge