Merge tag 'upstream/4.00.0__dev15+12379' into 4.00/master
authorStephane Glondu <steph@glondu.net>
Thu, 19 Apr 2012 06:30:06 +0000 (08:30 +0200)
committerStephane Glondu <steph@glondu.net>
Thu, 19 Apr 2012 06:30:06 +0000 (08:30 +0200)
Upstream version 4.00.0~~dev15+12379


Trivial merge