Merge branch 'upstream'
authorRalf Treinen <treinen@debian.org>
Mon, 12 May 2008 19:46:34 +0000 (19:46 +0000)
committerRalf Treinen <treinen@debian.org>
Mon, 12 May 2008 19:46:34 +0000 (19:46 +0000)

Trivial merge