Merge branch 'upstream' into 3.10.0beta
authorStefano Zacchiroli <zack@debian.org>
Wed, 13 Jun 2007 12:34:29 +0000 (12:34 +0000)
committerStefano Zacchiroli <zack@debian.org>
Wed, 13 Jun 2007 12:34:29 +0000 (12:34 +0000)

Trivial merge