Merge branch 'master' into hpc2

author roy zang <[email protected]>

Tue, 30 Jan 2007 08:43:18 +0000 (16:43 +0800)

committer Zang Tiefei <[email protected]>

Tue, 30 Jan 2007 08:43:18 +0000 (16:43 +0800)
author roy zang <[email protected]>
Tue, 30 Jan 2007 08:43:18 +0000 (16:43 +0800)
committer Zang Tiefei <[email protected]>
Tue, 30 Jan 2007 08:43:18 +0000 (16:43 +0800)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	roy zang <[email protected]>
	Tue, 30 Jan 2007 08:43:18 +0000 (16:43 +0800)
committer	Zang Tiefei <[email protected]>
	Tue, 30 Jan 2007 08:43:18 +0000 (16:43 +0800)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history