Merge commit 'upstream/3.12.0.rc1' into 312/master
authorStephane Glondu <steph@glondu.net>
Sat, 24 Jul 2010 12:19:59 +0000 (14:19 +0200)
committerStephane Glondu <steph@glondu.net>
Sat, 24 Jul 2010 12:19:59 +0000 (14:19 +0200)
commit632b952d67d0b2f80703ceb32ecd186659cee16a
tree6bb3bb9030c9956bb66abb5259843c6a369dd402
parent08e64e5761b603a8b84edbf8ace67d53a8bfa9e7
parenta714f91eab829f77f7537bf916fde76e496d816c
Merge commit 'upstream/3.12.0.rc1' into 312/master