From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Fri, 8 Jan 2010 16:10:30 +0000 (+0100)
Subject: Merge remote branch 'origin/glibc-upgrade' into amavisd-update
X-Git-Tag: v2.6~112^2~15^2~3
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=316e99aaad7da376750743c8f7f264c246973ffa;p=libi2ncommon

Merge remote branch 'origin/glibc-upgrade' into amavisd-update
want to profit from the new developments and make cherry-picking more easy

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

316e99aaad7da376750743c8f7f264c246973ffa