merge of 23bb3a5261f624ea5502a4ccac2f393b317945aa
authorFlorian Boor <florian.boor@kernelconcepts.de>
Mon, 4 Jul 2005 21:12:18 +0000 (21:12 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jul 2005 21:12:18 +0000 (21:12 +0000)
     and 6fea75a01717e9a3be9efaa5c936d47364d6f317

1  2 
conf/machine/nokia770.conf

Simple merge