* merge from the mvo branch

author Michael Vogt <egon@bottom>

Fri, 14 Mar 2008 14:22:48 +0000 (15:22 +0100)

committer Michael Vogt <egon@bottom>

Fri, 14 Mar 2008 14:22:48 +0000 (15:22 +0100)
author Michael Vogt <egon@bottom>
Fri, 14 Mar 2008 14:22:48 +0000 (15:22 +0100)
committer Michael Vogt <egon@bottom>
Fri, 14 Mar 2008 14:22:48 +0000 (15:22 +0100)
diff --cc cmdline/apt-get.cc
Simple merge
diff --cc debian/changelog
Simple merge
author	Michael Vogt <egon@bottom>
	Fri, 14 Mar 2008 14:22:48 +0000 (15:22 +0100)
committer	Michael Vogt <egon@bottom>
	Fri, 14 Mar 2008 14:22:48 +0000 (15:22 +0100)
		1	2
cmdline/apt-get.cc	patch \|	diff1 \|	diff2 \|	blob \| history
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history