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)
commitbe495162dd3fd29e9f3d3faf12ea8ab0eeee0c22
tree990c1f8bb8fa710f74bf8abc87de2b8209662eeb
parent316e99aaad7da376750743c8f7f264c246973ffa
parentbfa045903e2eb1fc835df5dd501927a8d953be82
Merge remote branch 'origin/glibc-upgrade' into amavisd-update

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