Sync with Michael
authorbubulle@debian.org <>
Fri, 6 Jul 2007 05:18:13 +0000 (07:18 +0200)
committerbubulle@debian.org <>
Fri, 6 Jul 2007 05:18:13 +0000 (07:18 +0200)

Trivial merge