Merge commit 'remotes/wd/master'

author Jon Loeliger <jdl@freescale.com>

Fri, 2 Nov 2007 20:22:01 +0000 (15:22 -0500)

committer Jon Loeliger <jdl@freescale.com>

Fri, 2 Nov 2007 20:22:01 +0000 (15:22 -0500)
author Jon Loeliger <jdl@freescale.com>
Fri, 2 Nov 2007 20:22:01 +0000 (15:22 -0500)
committer Jon Loeliger <jdl@freescale.com>
Fri, 2 Nov 2007 20:22:01 +0000 (15:22 -0500)
diff --cc MAKEALL
Simple merge
diff --cc Makefile
Simple merge
author	Jon Loeliger <jdl@freescale.com>
	Fri, 2 Nov 2007 20:22:01 +0000 (15:22 -0500)
committer	Jon Loeliger <jdl@freescale.com>
	Fri, 2 Nov 2007 20:22:01 +0000 (15:22 -0500)
		1	2
MAKEALL	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history