Merge tag 'upstream/4.01.0' into experimental/master
authorStephane Glondu <steph@glondu.net>
Thu, 17 Oct 2013 09:40:06 +0000 (11:40 +0200)
committerStephane Glondu <steph@glondu.net>
Thu, 17 Oct 2013 09:40:06 +0000 (11:40 +0200)
Upstream version 4.01.0


Trivial merge