Merge branch 'cdbs'
authorStefano Zacchiroli <zack@debian.org>
Sat, 16 Sep 2006 14:06:54 +0000 (14:06 +0000)
committerStefano Zacchiroli <zack@debian.org>
Sat, 16 Sep 2006 14:06:54 +0000 (14:06 +0000)

Trivial merge