Merge commit 'upstream/3.11.2.rc1' into experimental/master
authorStephane Glondu <steph@glondu.net>
Mon, 28 Dec 2009 15:11:23 +0000 (16:11 +0100)
committerStephane Glondu <steph@glondu.net>
Mon, 28 Dec 2009 17:50:06 +0000 (18:50 +0100)
commit539d7c7fdda8ec9effba45192dcbf00ed472afd0
tree562916e3d8190d8c89e78abee7fe4a45c063bb11
parent4a4c9f394fa6106356cf98a75011360eb7068494
parentc014d03a2b3a4cbba4b7b876037b540c820a1d4f
Merge commit 'upstream/3.11.2.rc1' into experimental/master