Merge commit 'upstream/1.2'
authorJulien Valroff <julien@kirya.net>
Fri, 30 Dec 2011 09:44:01 +0000 (10:44 +0100)
committerJulien Valroff <julien@kirya.net>
Fri, 30 Dec 2011 09:44:01 +0000 (10:44 +0100)

Trivial merge