Merge with Michael
authorbubulle@debian.org <>
Sat, 21 Apr 2007 20:21:43 +0000 (22:21 +0200)
committerbubulle@debian.org <>
Sat, 21 Apr 2007 20:21:43 +0000 (22:21 +0200)

Trivial merge