Merge commit 'upstream/0.2.7'
authorJulien Valroff <julien@kirya.net>
Sat, 1 May 2010 06:33:47 +0000 (08:33 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 1 May 2010 06:33:47 +0000 (08:33 +0200)

Trivial merge