merge of 478afa572b085ffd7462b36a0578c6b3c783c9ef
authorFlorian Boor <florian.boor@kernelconcepts.de>
Sat, 4 Mar 2006 22:44:02 +0000 (22:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Mar 2006 22:44:02 +0000 (22:44 +0000)
commit4cd32d899d58328705a85fa08eeb6d28e7e56f08
treeb15e5056722b806a19f684b856dc2d438a24c0e6
parent9c9228641516c79db18221a19314365f7436e97b
parentfb9764287ceba9b4876c4876d30e0c63d6247131
merge of 478afa572b085ffd7462b36a0578c6b3c783c9ef
     and 5ad87c11b1a8f58b866accc34540928d3da271e3