Merge branch 'upstream' into 3.09.2rc1
authorJulien Cristau <julien.cristau@ens-lyon.org>
Thu, 30 Mar 2006 15:16:40 +0000 (15:16 +0000)
committerJulien Cristau <julien.cristau@ens-lyon.org>
Thu, 30 Mar 2006 15:16:40 +0000 (15:16 +0000)

Trivial merge