merge of 655c27b21e9a61ebe5a2012682a1b2fe05fd32de
authorFlorian Boor <florian.boor@kernelconcepts.de>
Wed, 23 Nov 2005 21:24:56 +0000 (21:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 23 Nov 2005 21:24:56 +0000 (21:24 +0000)
commit073c4d63851835cfa9774b1737765b3dce7ce40a
tree4936d27cd5f4f8332eb8859f21149d9664d5f195
parent94d14ff9e7623337ece7bcafa4c373949ed78c19
parent0606a8c4e8e276fe7bf0550b9aa930adb6682be9
merge of 655c27b21e9a61ebe5a2012682a1b2fe05fd32de
     and 6cd20908e73dce47aed78e3e9d4550408ac3f82c