merge changes from dla source tree
authorDebian BTS <debbugs@rietz>
Tue, 19 Jun 2007 13:05:36 +0000 (13:05 +0000)
committerDebian BTS <debbugs@rietz>
Tue, 19 Jun 2007 13:05:36 +0000 (13:05 +0000)

Trivial merge