merge changes from dla source tree
authorDebian BTS <debbugs@rietz>
Fri, 19 Sep 2008 00:19:15 +0000 (00:19 +0000)
committerDebian BTS <debbugs@rietz>
Fri, 19 Sep 2008 00:19:15 +0000 (00:19 +0000)

Trivial merge