Merge commit 'upstream/0.2.11+dfsg'
authorJulien Valroff <julien@kirya.net>
Wed, 4 Jan 2012 17:50:42 +0000 (18:50 +0100)
committerJulien Valroff <julien@kirya.net>
Wed, 4 Jan 2012 17:50:42 +0000 (18:50 +0100)

Trivial merge