Merge commit 'upstream/0.2.11'
authorJulien Valroff <julien@kirya.net>
Tue, 6 Jul 2010 12:16:29 +0000 (14:16 +0200)
committerJulien Valroff <julien@kirya.net>
Tue, 6 Jul 2010 12:16:29 +0000 (14:16 +0200)

Trivial merge