Merge branch 'tz/make-improvements'

author Lars Hjemli <hjemli@gmail.com>

Tue, 9 Nov 2010 23:28:56 +0000 (00:28 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Tue, 9 Nov 2010 23:28:56 +0000 (00:28 +0100)
author Lars Hjemli <hjemli@gmail.com>
Tue, 9 Nov 2010 23:28:56 +0000 (00:28 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Tue, 9 Nov 2010 23:28:56 +0000 (00:28 +0100)
diff --cc Makefile
Simple merge
diff --cc cgitrc.5.txt
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Tue, 9 Nov 2010 23:28:56 +0000 (00:28 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Tue, 9 Nov 2010 23:28:56 +0000 (00:28 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cgitrc.5.txt	patch \|	diff1 \|	diff2 \|	blob \| history