Merge branch 'upstream'
authorJulien Cristau <julien.cristau@ens-lyon.org>
Wed, 4 Jan 2006 15:01:17 +0000 (15:01 +0000)
committerJulien Cristau <julien.cristau@ens-lyon.org>
Wed, 4 Jan 2006 15:01:17 +0000 (15:01 +0000)

Trivial merge