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)
commit9fb20a31d4710af640235da1115c16b0580b861a
treeeebd50221daae3aa781f8d5dfe1fc7362ca300d2
parentd6c27efd3916dfba1d40f2892a44d9beccae4db0
parente43f49a77504dd336a337e670135b76a1d1b430d
Merge tag 'upstream/4.00.0_beta2' into experimental/master

Upstream version 4.00.0~beta2