* merged with mainline

author Michael Vogt <egon@bottom>

Tue, 12 Sep 2006 11:52:22 +0000 (13:52 +0200)

committer Michael Vogt <egon@bottom>

Tue, 12 Sep 2006 11:52:22 +0000 (13:52 +0200)
author Michael Vogt <egon@bottom>
Tue, 12 Sep 2006 11:52:22 +0000 (13:52 +0200)
committer Michael Vogt <egon@bottom>
Tue, 12 Sep 2006 11:52:22 +0000 (13:52 +0200)
diff --cc debian/changelog
Simple merge
diff --cc methods/http.cc
Simple merge
author	Michael Vogt <egon@bottom>
	Tue, 12 Sep 2006 11:52:22 +0000 (13:52 +0200)
committer	Michael Vogt <egon@bottom>
	Tue, 12 Sep 2006 11:52:22 +0000 (13:52 +0200)
		1	2
debian/changelog	patch \|	diff1 \|	diff2 \|	blob \| history
methods/http.cc	patch \|	diff1 \|	diff2 \|	blob \| history