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


Trivial merge