From: Thomas Jarosch <thomas.jarosch@intra2net.com>
Date: Mon, 8 Feb 2010 21:39:14 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into glibc-upgrade-merge
X-Git-Tag: v2.6~112^2~18
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=84d10b7b9d81c1defb9c29ab946ebf64c7209050;p=libi2ncommon

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

Conflicts:
	connd/connd/Makefile.am
	http_file_upload/http_file_upload.spec
	initramfs/configure.in
	initramfs/initramfs.spec
	initramfs/usr/intranator/bin/initramfs/build_initramfs.sh
	initramfs/usr/intranator/bin/initramfs/init
	ipsec_exe/ipsec_exe.spec
	packages/Mail-SpamAssassin/Mail-SpamAssassin.spec
	packages/bind/bind.spec
	packages/dhcp/dhcp.spec
	packages/dhcpcd/dhcpcd.spec
	packages/fetchmail/fetchmail.spec
	packages/file/file.spec
	packages/gzip/gzip-1.3.5-zforce.patch
	packages/gzip/gzip-1.3.9-rsync.patch
	packages/gzip/gzip.spec
	packages/initscripts/initscripts.spec
	packages/kernel-2.6/kernel-2.6.spec
	packages/logcheck/logcheck.spec
	packages/openssl/openssl.spec
	packages/php/php.spec
	packages/strongswan/strongswan.spec
	sarules/configure.in
	sarules_update/sarules_update.spec
	trusted_net_helper/trusted_net_helper.spec
	update_cnf/src/Makefile.am
---

84d10b7b9d81c1defb9c29ab946ebf64c7209050