Merge commit 'upstream/0.2.4'
authorJulien Valroff <julien@kirya.net>
Tue, 30 Mar 2010 17:44:09 +0000 (19:44 +0200)
committerJulien Valroff <julien@kirya.net>
Tue, 30 Mar 2010 17:44:09 +0000 (19:44 +0200)

Trivial merge