Merge commit 'upstream/0.9'
authorJulien Valroff <julien@kirya.net>
Thu, 1 Sep 2011 04:51:36 +0000 (06:51 +0200)
committerJulien Valroff <julien@kirya.net>
Thu, 1 Sep 2011 04:51:36 +0000 (06:51 +0200)

Trivial merge