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

Merge remote branch 'origin/glibc-upgrade' into amavisd-update

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

be495162dd3fd29e9f3d3faf12ea8ab0eeee0c22