Merge remote branch 'origin/glibc-upgrade' into amavisd-update
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 14 Jan 2010 11:10:19 +0000 (12:10 +0100)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 14 Jan 2010 11:10:19 +0000 (12:10 +0100)
Conflicts:
packages/amavisd-new/amavisd-new.spec


Trivial merge