Merge commit 'wd/master'

author Jon Loeliger <[email protected]>

Thu, 6 Dec 2007 17:27:32 +0000 (11:27 -0600)

committer Jon Loeliger <[email protected]>

Thu, 6 Dec 2007 17:27:32 +0000 (11:27 -0600)
author Jon Loeliger <[email protected]>
Thu, 6 Dec 2007 17:27:32 +0000 (11:27 -0600)
committer Jon Loeliger <[email protected]>
Thu, 6 Dec 2007 17:27:32 +0000 (11:27 -0600)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Jon Loeliger <[email protected]>
	Thu, 6 Dec 2007 17:27:32 +0000 (11:27 -0600)
committer	Jon Loeliger <[email protected]>
	Thu, 6 Dec 2007 17:27:32 +0000 (11:27 -0600)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history