From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Wed, 23 Dec 2009 14:59:39 +0000 (+0100)
Subject: Merge branch 'master' into glibc-uprade-HEAD-merge
X-Git-Tag: v2.6~112^2~20
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=bfa045903e2eb1fc835df5dd501927a8d953be82;p=libi2ncommon

Merge branch 'master' into glibc-uprade-HEAD-merge

Conflicts:
	add_dhcp_client/add_dhcp_client.spec
	arniesetup/arniesetup.spec
	backup_push/backup_push.spec
	check_ip_conflict/check_ip_conflict.spec
	configuration/etc/crontab
	get_cnf/get_cnf.spec
	info_fetchmail/info_fetchmail.spec
	info_iponline/info_iponline.spec
	initramfs/initramfs.spec
	keymgt/keymgt.spec
	libcnffile/config.h.in
	libcnffile/libcnffile.spec
	misc/git_webexport.sh
	packages/Mail-SpamAssassin/Mail-SpamAssassin.spec
	packages/amavisd-new/amavisd-new.spec
	packages/bind/bind.spec
	packages/cmake/cmake.spec
	packages/curl-ssl/curl-ssl.spec
	packages/cyrus-imapd/cyrus-imapd.spec
	packages/fetchmail/fetchmail.spec
	packages/file/file-disable-msdos-com.patch
	packages/file/file.spec
	packages/fsav/fsav.spec
	packages/fsavpkgupdate/fsavpkgupdate.spec
	packages/git/git-mkdtemp-old-glibc.patch
	packages/git/git.spec
	packages/initscripts/initscripts.spec
	packages/iproute/iproute.spec
	packages/iptables/iptables.spec
	packages/libpng/libpng.spec
	packages/libt2n/libt2n.spec
	packages/libtiff/libtiff.spec
	packages/logcheck/logcheck.spec
	packages/newt/newt.spec
	packages/openssl/openssl.spec
	packages/perl-IO-Socket-SSL/perl-IO-Socket-SSL.spec
	packages/perl/perl.spec
	packages/php/php.spec
	packages/postfix/postfix.spec
	packages/samba/samba.spec
	packages/squid/squid.spec
	packages/squidguard/squidguard.spec
	packages/strongswan/strongswan.spec
	packages/udev/udev.spec
	packages/webmail/webmail.spec
	ui/ui/form_antivirus_quarantine.cpp
	wol/wol.spec
---

bfa045903e2eb1fc835df5dd501927a8d953be82