Merge reworked geoip extension

author Jan Engelhardt <jengelh@computergmbh.de>

Sat, 22 Mar 2008 04:16:51 +0000 (05:16 +0100)

committer Jan Engelhardt <jengelh@computergmbh.de>

Sat, 22 Mar 2008 04:16:53 +0000 (05:16 +0100)
author Jan Engelhardt <jengelh@computergmbh.de>
Sat, 22 Mar 2008 04:16:51 +0000 (05:16 +0100)
committer Jan Engelhardt <jengelh@computergmbh.de>
Sat, 22 Mar 2008 04:16:53 +0000 (05:16 +0100)
diff --cc extensions/Kbuild
Simple merge
diff --cc mconfig
Simple merge
author	Jan Engelhardt <jengelh@computergmbh.de>
	Sat, 22 Mar 2008 04:16:51 +0000 (05:16 +0100)
committer	Jan Engelhardt <jengelh@computergmbh.de>
	Sat, 22 Mar 2008 04:16:53 +0000 (05:16 +0100)
		1	2
extensions/Kbuild	patch \|	diff1 \|	diff2 \|	blob \| history
mconfig	patch \|	diff1 \|	diff2 \|	blob \| history