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)
commita4de844e4e36bda0d174b5abe7396302a3da7cb8
treece6250b53584f05931eba8608dd19c80db7e5732
parent1c2c9a48b6502d670f0301041ebf6688fe2253a5
parent346e58093d219a8a3a8b08855edca4559d41d62e
merge of 23bb3a5261f624ea5502a4ccac2f393b317945aa
     and 6fea75a01717e9a3be9efaa5c936d47364d6f317
conf/machine/nokia770.conf