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)
commit67ea5ddd4df828592a6ab4ea7ab9d2e43e978eb6
tree4caad5f71ed9cff980cf86b9282eefbb98dfe83c
parent02d763306f15e9de24f1519fb21eae4ede9ee735
parentd33fdfe542244c97fed5f725bdbc4feb78647662
Merge tag 'upstream/4.00.1' into experimental/master

Upstream version 4.00.1