Merge tag 'upstream/4.00.0__dev15+12379' into 4.00/master
authorStephane Glondu <steph@glondu.net>
Thu, 19 Apr 2012 06:30:06 +0000 (08:30 +0200)
committerStephane Glondu <steph@glondu.net>
Thu, 19 Apr 2012 06:30:06 +0000 (08:30 +0200)
commitcd5aee220c88cc32548ec2ec0f04cd7bda4f6997
treeb09b30c2b483a02fc5896bb7ededdbbeb8765768
parente1bb0fdb2800ccb883d74e9fddcbb9c6726074f3
parent94f43cd11cead554e8062922176d15abbee967b4
Merge tag 'upstream/4.00.0__dev15+12379' into 4.00/master

Upstream version 4.00.0~~dev15+12379