Merge commit 'upstream/0.2.10'
authorJulien Valroff <julien@kirya.net>
Wed, 26 May 2010 17:05:44 +0000 (19:05 +0200)
committerJulien Valroff <julien@kirya.net>
Wed, 26 May 2010 17:05:44 +0000 (19:05 +0200)

Trivial merge