Merge [1386]-[1442] into 0.5.x branch.

author Peter Johnson <peter@tortall.net>

Fri, 31 Mar 2006 05:16:59 +0000 (05:16 -0000)

committer Peter Johnson <peter@tortall.net>

Fri, 31 Mar 2006 05:16:59 +0000 (05:16 -0000)
author Peter Johnson <peter@tortall.net>
Fri, 31 Mar 2006 05:16:59 +0000 (05:16 -0000)
committer Peter Johnson <peter@tortall.net>
Fri, 31 Mar 2006 05:16:59 +0000 (05:16 -0000)
diff --cc Mkfiles/dj/config.h
Simple merge
diff --cc Mkfiles/vc/config.h
Simple merge
diff --cc Mkfiles/vc8/config.h
Simple merge
author	Peter Johnson <peter@tortall.net>
	Fri, 31 Mar 2006 05:16:59 +0000 (05:16 -0000)
committer	Peter Johnson <peter@tortall.net>
	Fri, 31 Mar 2006 05:16:59 +0000 (05:16 -0000)
		1	2
Mkfiles/dj/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
Mkfiles/vc/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
Mkfiles/vc8/config.h	patch \|	diff1 \|	diff2 \|	blob \| history