merged fixes from lp:~mvo/apt/mvo

author Michael Vogt <egon@debian-devbox>

Mon, 15 Aug 2011 07:23:39 +0000 (09:23 +0200)

committer Michael Vogt <egon@debian-devbox>

Mon, 15 Aug 2011 07:23:39 +0000 (09:23 +0200)
author Michael Vogt <egon@debian-devbox>
Mon, 15 Aug 2011 07:23:39 +0000 (09:23 +0200)
committer Michael Vogt <egon@debian-devbox>
Mon, 15 Aug 2011 07:23:39 +0000 (09:23 +0200)
diff --cc apt-pkg/acquire-item.cc
Simple merge
diff --cc apt-pkg/pkgcachegen.cc
Simple merge
author	Michael Vogt <egon@debian-devbox>
	Mon, 15 Aug 2011 07:23:39 +0000 (09:23 +0200)
committer	Michael Vogt <egon@debian-devbox>
	Mon, 15 Aug 2011 07:23:39 +0000 (09:23 +0200)
		1	2
apt-pkg/acquire-item.cc	patch \|	diff1 \|	diff2 \|	blob \| history
apt-pkg/pkgcachegen.cc	patch \|	diff1 \|	diff2 \|	blob \| history