Sync with Michael after 0.6.46.2 release
authorbubulle@debian.org <>
Wed, 11 Oct 2006 17:52:36 +0000 (19:52 +0200)
committerbubulle@debian.org <>
Wed, 11 Oct 2006 17:52:36 +0000 (19:52 +0200)

Trivial merge