merge of '761183d571c60b5df965993faf1c23d3f933718b'
authorOpenmoko anonymizer key <devel@lists.openmoko.org>
Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)
committerOpenmoko anonymizer key <devel@lists.openmoko.org>
Sun, 2 Sep 2007 22:14:36 +0000 (22:14 +0000)
commitc1cfc8256ffcde3d0afd4de42b6f36b715c60dcb
treedbd86d9a8c2879937d1b40602fc97597470329e6
parent98081bc36be3bb72de6ff3e57bc1a713fb453879
parent31d144ff07c336393c2bc55ee5e486e17ee0bcfb
Merge ... '761183d571c60b5df965993faf1c23d3f933718b'
     and 'd52a54d5f2ae378fe03f9c8d4cfb66d2d6a45d41'
conf/machine/fic-gta01.conf
conf/machine/fic-gta02.conf
conf/machine/include/motorola-ezx-base.inc