merge of '761183d571c60b5df965993faf1c23d3f933718b'

author Openmoko anonymizer key <devel@lists.openmoko.org>

Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)

committer Openmoko anonymizer key <devel@lists.openmoko.org>

Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)
author Openmoko anonymizer key <devel@lists.openmoko.org>
Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)
committer Openmoko anonymizer key <devel@lists.openmoko.org>
Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)
diff --cc conf/machine/fic-gta01.conf
Simple merge
diff --cc conf/machine/fic-gta02.conf
Simple merge
diff --cc conf/machine/include/motorola-ezx-base.inc
Simple merge
author	Openmoko anonymizer key <devel@lists.openmoko.org>
	Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)
committer	Openmoko anonymizer key <devel@lists.openmoko.org>
	Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)
		1	2
conf/machine/fic-gta01.conf	patch \|	diff1 \|	diff2 \|	blob \| history
conf/machine/fic-gta02.conf	patch \|	diff1 \|	diff2 \|	blob \| history
conf/machine/include/motorola-ezx-base.inc	patch \|	diff1 \|	diff2 \|	blob \| history