* merged with mainline

author Michael Vogt <egon@bottom>

Fri, 9 Jun 2006 15:49:10 +0000 (17:49 +0200)

committer Michael Vogt <egon@bottom>

Fri, 9 Jun 2006 15:49:10 +0000 (17:49 +0200)
author Michael Vogt <egon@bottom>
Fri, 9 Jun 2006 15:49:10 +0000 (17:49 +0200)
committer Michael Vogt <egon@bottom>
Fri, 9 Jun 2006 15:49:10 +0000 (17:49 +0200)
diff --cc apt-pkg/tagfile.cc
Simple merge
diff --cc debian/changelog
Simple merge
author	Michael Vogt <egon@bottom>
	Fri, 9 Jun 2006 15:49:10 +0000 (17:49 +0200)
committer	Michael Vogt <egon@bottom>
	Fri, 9 Jun 2006 15:49:10 +0000 (17:49 +0200)
		1	2
apt-pkg/tagfile.cc	patch \|	diff1 \|	diff2 \|	blob \| history
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history