Merge commit 'upstream/0.2.8'
authorJulien Valroff <julien@kirya.net>
Fri, 7 May 2010 21:07:57 +0000 (23:07 +0200)
committerJulien Valroff <julien@kirya.net>
Fri, 7 May 2010 21:07:57 +0000 (23:07 +0200)

Trivial merge