Merge tag 'upstream/1.5'
authorJulien Valroff <julien@kirya.net>
Fri, 6 Apr 2012 13:57:23 +0000 (15:57 +0200)
committerJulien Valroff <julien@kirya.net>
Fri, 6 Apr 2012 13:57:23 +0000 (15:57 +0200)
Upstream version 1.5


Trivial merge