[Amavisd-new-debian-devel] 2.2.1 merge complete

[Henrique de Moraes Holschuh]

The code and doc merging is complete.

I have *not* merged debian/etc, since we will be rewriting those anyway, and
splitting the config files.

Build depends need to be revised, and we have to get rid of berkeley-db
since it is not mandatory anymore (and it is also asking for trouble to use
it).

The tree is open again.

-- 
  "One disk to rule them all, One disk to find them. One disk to bring
  them all and in the darkness grind them. In the Land of Redmond
  where the shadows lie." -- The Silicon Valley Tarot
  Henrique Holschuh