Merge tag 'upstream/4.00.1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Wed, 14 Nov 2012 12:02:57 +0000 (13:02 +0100)
committerStephane Glondu <steph@glondu.net>
Wed, 14 Nov 2012 12:02:57 +0000 (13:02 +0100)
Upstream version 4.00.1


Trivial merge