* merged with mainline

author Michael Vogt <egon@bottom>

Wed, 26 Jul 2006 22:36:59 +0000 (00:36 +0200)

committer Michael Vogt <egon@bottom>

Wed, 26 Jul 2006 22:36:59 +0000 (00:36 +0200)
author Michael Vogt <egon@bottom>
Wed, 26 Jul 2006 22:36:59 +0000 (00:36 +0200)
committer Michael Vogt <egon@bottom>
Wed, 26 Jul 2006 22:36:59 +0000 (00:36 +0200)
diff --cc apt-pkg/acquire-item.cc
Simple merge
diff --cc debian/changelog
Simple merge
author	Michael Vogt <egon@bottom>
	Wed, 26 Jul 2006 22:36:59 +0000 (00:36 +0200)
committer	Michael Vogt <egon@bottom>
	Wed, 26 Jul 2006 22:36:59 +0000 (00:36 +0200)
		1	2
apt-pkg/acquire-item.cc	patch \|	diff1 \|	diff2 \|	blob \| history
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history