From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Wed, 24 Feb 2010 15:52:27 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into glibc-upgrade
X-Git-Tag: v2.6~112^2~17
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=03885aedbc7832d5764664f2db0f3750e46b34fe;p=libi2ncommon

Merge remote branch 'origin/master' into glibc-upgrade

Conflicts:
	packages/cyrus-imapd/cyrus-imapd.spec
	packages/git/git.spec
	packages/kernel-2.6/kernel-2.6.spec
	sarules/configure.in
---

03885aedbc7832d5764664f2db0f3750e46b34fe