merge changes from dla bugscan
authorDebian BTS <debbugs@busoni>
Sun, 1 Aug 2010 20:43:15 +0000 (20:43 +0000)
committerDebian BTS <debbugs@busoni>
Sun, 1 Aug 2010 20:43:15 +0000 (20:43 +0000)

Trivial merge