Merge commit 'upstream/3.12.1'
authorStephane Glondu <steph@glondu.net>
Tue, 5 Jul 2011 19:28:17 +0000 (21:28 +0200)
committerStephane Glondu <steph@glondu.net>
Tue, 5 Jul 2011 19:28:17 +0000 (21:28 +0200)
commita6ff0ea1f9416f34ca054c5608af29632414334b
treedc910ec4272cb6ab75e0efa207478af6b07b8e42
parentf2b31c94981f4fa415d67a963a276fc137c1e2da
parentc05307b6107ba633a8ac724a5f68cc55a172a8b4
Merge commit 'upstream/3.12.1'