Merge commit 'upstream/1.1'
authorJulien Valroff <julien@kirya.net>
Sat, 1 Oct 2011 11:11:34 +0000 (13:11 +0200)
committerJulien Valroff <julien@kirya.net>
Sat, 1 Oct 2011 11:11:34 +0000 (13:11 +0200)

Trivial merge