Merge branch 'upstream'
authorSamuel Mimram <smimram@debian.org>
Sun, 16 Apr 2006 23:38:25 +0000 (23:38 +0000)
committerSamuel Mimram <smimram@debian.org>
Sun, 16 Apr 2006 23:38:25 +0000 (23:38 +0000)

Trivial merge