Merge remote branch 'origin/master' into glibc-upgrade
authorThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 15:52:27 +0000 (16:52 +0100)
committerThomas Jarosch <thomas.jarosch@intra2net.com>
Wed, 24 Feb 2010 15:52:27 +0000 (16:52 +0100)
commit03885aedbc7832d5764664f2db0f3750e46b34fe
treea861bb9c2c511f874ea4a28d183d67397eb05f05
parent84d10b7b9d81c1defb9c29ab946ebf64c7209050
parenta43e76fe877f8ebaaeb4f3fdae14c98f048a7db1
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