merged with apt--mvo

author Michael Vogt <egon@tas>

Thu, 7 Dec 2006 10:45:13 +0000 (11:45 +0100)

committer Michael Vogt <egon@tas>

Thu, 7 Dec 2006 10:45:13 +0000 (11:45 +0100)
author Michael Vogt <egon@tas>
Thu, 7 Dec 2006 10:45:13 +0000 (11:45 +0100)
committer Michael Vogt <egon@tas>
Thu, 7 Dec 2006 10:45:13 +0000 (11:45 +0100)
diff --cc apt-pkg/acquire-item.cc
Simple merge
diff --cc apt-pkg/acquire-item.h
Simple merge
diff --cc doc/examples/configure-index
Simple merge
author	Michael Vogt <egon@tas>
	Thu, 7 Dec 2006 10:45:13 +0000 (11:45 +0100)
committer	Michael Vogt <egon@tas>
	Thu, 7 Dec 2006 10:45:13 +0000 (11:45 +0100)
		1	2
apt-pkg/acquire-item.cc	patch \|	diff1 \|	diff2 \|	blob \| history
apt-pkg/acquire-item.h	patch \|	diff1 \|	diff2 \|	blob \| history
doc/examples/configure-index	patch \|	diff1 \|	diff2 \|	blob \| history