Merge tag 'upstream/4.00.0_beta2' into experimental/master
authorStephane Glondu <steph@glondu.net>
Wed, 13 Jun 2012 08:06:55 +0000 (10:06 +0200)
committerStephane Glondu <steph@glondu.net>
Wed, 13 Jun 2012 08:06:55 +0000 (10:06 +0200)
Upstream version 4.00.0~beta2


Trivial merge