Really apply HE's changes.
authorMarc 'HE' Brockschmidt <he@debian.org>
Tue, 25 Dec 2007 17:32:43 +0000 (18:32 +0100)
committerMarc 'HE' Brockschmidt <he@debian.org>
Tue, 25 Dec 2007 17:32:43 +0000 (18:32 +0100)

Trivial merge