Merge tag 'upstream/1'
authorJulien Valroff <julien@kirya.net>
Fri, 2 Mar 2012 18:00:26 +0000 (19:00 +0100)
committerJulien Valroff <julien@kirya.net>
Fri, 2 Mar 2012 18:00:26 +0000 (19:00 +0100)
Upstream version 1


Trivial merge