merge of c24a7375060d5ad599851af14ea91bce14d3092b
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Jul 2006 17:25:47 +0000 (17:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 3 Jul 2006 17:25:47 +0000 (17:25 +0000)
commit3b36fe68738ea7f4b4cc9d5fd82477d066d2f1b9
treeb9bbf157fd54dd09961d4d888ddfa1aff70e7bec
parentb6b2930ebf642a880b1862f60d29608c8a19193a
parent353d8c7eecf685d8e10b1ee103c0efe526d1ef3c
merge of c24a7375060d5ad599851af14ea91bce14d3092b
     and d590807735761852af55b2d7ebce85ba1dcd42d1