Merge commit 'upstream/3.12.0.beta1' into 312/master
authorStephane Glondu <steph@glondu.net>
Wed, 16 Jun 2010 15:36:05 +0000 (08:36 -0700)
committerStephane Glondu <steph@glondu.net>
Wed, 16 Jun 2010 15:36:05 +0000 (08:36 -0700)
commitfa02bbd04d44037dd8a3646968faf2d75c57b176
tree26c609d54feaa0083320634cfba52ac89a1de052
parent7d834c432ff8fe9676f2aa33f2214476ea2aa04f
parent22d77e2416e2a1d20dd6bcddbd2ef05ef71c9af9
Merge commit 'upstream/3.12.0.beta1' into 312/master