* merged the apt--curl-https branch

author Michael Vogt <michael.vogt@ubuntu.com>

Tue, 19 Dec 2006 15:21:35 +0000 (16:21 +0100)

committer Michael Vogt <michael.vogt@ubuntu.com>

Tue, 19 Dec 2006 15:21:35 +0000 (16:21 +0100)
author Michael Vogt <michael.vogt@ubuntu.com>
Tue, 19 Dec 2006 15:21:35 +0000 (16:21 +0100)
committer Michael Vogt <michael.vogt@ubuntu.com>
Tue, 19 Dec 2006 15:21:35 +0000 (16:21 +0100)
diff --cc debian/control
Simple merge
diff --cc debian/rules
Simple merge
diff --cc doc/examples/configure-index
Simple merge
diff --cc methods/makefile
Simple merge
author	Michael Vogt <michael.vogt@ubuntu.com>
	Tue, 19 Dec 2006 15:21:35 +0000 (16:21 +0100)
committer	Michael Vogt <michael.vogt@ubuntu.com>
	Tue, 19 Dec 2006 15:21:35 +0000 (16:21 +0100)
		1	2
debian/control	patch \|	diff1 \|	diff2 \|	blob \| history
debian/rules	patch \|	diff1 \|	diff2 \|	blob \| history
doc/examples/configure-index	patch \|	diff1 \|	diff2 \|	blob \| history
methods/makefile	patch \|	diff1 \|	diff2 \|	blob \| history