Merge tag 'upstream/4.00.0_rc1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Sat, 21 Jul 2012 12:36:47 +0000 (14:36 +0200)
committerStephane Glondu <steph@glondu.net>
Sat, 21 Jul 2012 12:36:47 +0000 (14:36 +0200)
Upstream version 4.00.0~rc1


Trivial merge