Merge tag 'upstream/4.00.0' into experimental/master
authorStephane Glondu <steph@glondu.net>
Fri, 27 Jul 2012 05:25:24 +0000 (07:25 +0200)
committerStephane Glondu <steph@glondu.net>
Fri, 27 Jul 2012 05:25:24 +0000 (07:25 +0200)
Upstream version 4.00.0


Trivial merge