* merged from the apt--auto-mark branch

author Michael Vogt <egon@bottom>

Thu, 14 Dec 2006 10:34:01 +0000 (11:34 +0100)

committer Michael Vogt <egon@bottom>

Thu, 14 Dec 2006 10:34:01 +0000 (11:34 +0100)
author Michael Vogt <egon@bottom>
Thu, 14 Dec 2006 10:34:01 +0000 (11:34 +0100)
committer Michael Vogt <egon@bottom>
Thu, 14 Dec 2006 10:34:01 +0000 (11:34 +0100)
diff --cc cmdline/apt-get.cc
Simple merge
diff --cc doc/apt-get.8.xml
Simple merge
author	Michael Vogt <egon@bottom>
	Thu, 14 Dec 2006 10:34:01 +0000 (11:34 +0100)
committer	Michael Vogt <egon@bottom>
	Thu, 14 Dec 2006 10:34:01 +0000 (11:34 +0100)
		1	2
cmdline/apt-get.cc	patch \|	diff1 \|	diff2 \|	blob \| history
doc/apt-get.8.xml	patch \|	diff1 \|	diff2 \|	blob \| history