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

Merge branch 'glibc-upgrade' into amavisd-update

Conflicts:
	packages/autoconf/autoconf.spec
	packages/python/python.spec
	packages/sqlite/sqlite.spec
---

42cfff480ff1f406f17d8e86e842ad31574d6ee5