Merge commit 'upstream/0.2.6'
authorJulien Valroff <julien@kirya.net>
Sat, 17 Apr 2010 10:31:34 +0000 (12:31 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 17 Apr 2010 10:31:34 +0000 (12:31 +0200)

Trivial merge