Merge commit 'upstream/1.0'
authorJulien Valroff <julien@kirya.net>
Mon, 5 Sep 2011 13:44:04 +0000 (15:44 +0200)
committerJulien Valroff <julien@kirya.net>
Mon, 5 Sep 2011 13:44:04 +0000 (15:44 +0200)

Trivial merge