* merged with apt--debian-sid

author Michael Vogt <egon@bottom>

Thu, 14 Dec 2006 10:29:20 +0000 (11:29 +0100)

committer Michael Vogt <egon@bottom>

Thu, 14 Dec 2006 10:29:20 +0000 (11:29 +0100)
author Michael Vogt <egon@bottom>
Thu, 14 Dec 2006 10:29:20 +0000 (11:29 +0100)
committer Michael Vogt <egon@bottom>
Thu, 14 Dec 2006 10:29:20 +0000 (11:29 +0100)
diff --cc apt-pkg/algorithms.cc
Simple merge
diff --cc apt-pkg/deb/debindexfile.cc
Simple merge
diff --cc configure.in
Simple merge
diff --cc debian/changelog
Simple merge
author	Michael Vogt <egon@bottom>
	Thu, 14 Dec 2006 10:29:20 +0000 (11:29 +0100)
committer	Michael Vogt <egon@bottom>
	Thu, 14 Dec 2006 10:29:20 +0000 (11:29 +0100)
		1	2
apt-pkg/algorithms.cc	patch \|	diff1 \|	diff2 \|	blob \| history
apt-pkg/deb/debindexfile.cc	patch \|	diff1 \|	diff2 \|	blob \| history
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history