Merge commit 'upstream/0.2.9'
authorJulien Valroff <julien@kirya.net>
Sat, 15 May 2010 16:57:26 +0000 (18:57 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 15 May 2010 16:57:26 +0000 (18:57 +0200)

Trivial merge