Merge branch 'upstream'
authorJulien Cristau <julien.cristau@ens-lyon.org>
Sat, 2 Sep 2006 09:24:33 +0000 (09:24 +0000)
committerJulien Cristau <julien.cristau@ens-lyon.org>
Sat, 2 Sep 2006 09:24:33 +0000 (09:24 +0000)

Trivial merge