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)
commit02b757e24e38f81501322241652f3de6e40aa32b
tree1e398b9c54f40eb1acf1810d52814a8bee3a9e4a
parent908fe5f4e25fedb103a74a9e1f44252df9c2948e
parentb96287d44838b8338a0aee56481546bf9374354f
Merge tag 'upstream/4.00.0_rc1' into experimental/master

Upstream version 4.00.0~rc1