merge changes from dla source branch
authorDebian BTS <debbugs@busoni>
Tue, 20 Mar 2012 17:21:16 +0000 (17:21 +0000)
committerDebian BTS <debbugs@busoni>
Tue, 20 Mar 2012 17:21:16 +0000 (17:21 +0000)

Trivial merge