Merge remote branch 'origin/glibc-upgrade' into amavisd-update
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Fri, 8 Jan 2010 16:10:30 +0000 (17:10 +0100)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Fri, 8 Jan 2010 16:10:30 +0000 (17:10 +0100)
want to profit from the new developments and make cherry-picking more easy

Conflicts:
packages/amavisd-new/amavisd-new.spec


Trivial merge