* merged from main

author Michael Vogt <egon@bottom>

Fri, 1 Dec 2006 13:24:33 +0000 (14:24 +0100)

committer Michael Vogt <egon@bottom>

Fri, 1 Dec 2006 13:24:33 +0000 (14:24 +0100)
author Michael Vogt <egon@bottom>
Fri, 1 Dec 2006 13:24:33 +0000 (14:24 +0100)
committer Michael Vogt <egon@bottom>
Fri, 1 Dec 2006 13:24:33 +0000 (14:24 +0100)
diff --cc apt-pkg/acquire-item.cc
Simple merge
diff --cc debian/changelog
Simple merge
diff --cc doc/examples/configure-index
Simple merge
author	Michael Vogt <egon@bottom>
	Fri, 1 Dec 2006 13:24:33 +0000 (14:24 +0100)
committer	Michael Vogt <egon@bottom>
	Fri, 1 Dec 2006 13:24:33 +0000 (14:24 +0100)
		1	2
apt-pkg/acquire-item.cc	patch \|	diff1 \|	diff2 \|	blob \| history
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history
doc/examples/configure-index	patch \|	diff1 \|	diff2 \|	blob \| history