Merge commit 'upstream/0.2.5'
authorJulien Valroff <julien@kirya.net>
Sun, 4 Apr 2010 12:16:33 +0000 (14:16 +0200)
committerJulien Valroff <julien@kirya.net>
Sun, 4 Apr 2010 12:16:33 +0000 (14:16 +0200)

Trivial merge