merge of 1fa7381f2503250b521218a5b5ee04a508cd6456
authorKoen Kooi <koen@openembedded.org>
Sun, 18 Sep 2005 19:45:08 +0000 (19:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 Sep 2005 19:45:08 +0000 (19:45 +0000)
commit937d6270be3bce3b61e82d1486d489d8597640c7
treeaf203441afd40d588fc63d295fdb2a71ed95c6ee
parentee44526f4f0e36072df485e2f9382f015607d198
parent4853d08b74cb9769d115e82e772eea1212c1cd0b
merge of 1fa7381f2503250b521218a5b5ee04a508cd6456
     and 7ff4c9eca8c99c6f15ec3a775fcd7f9113c528bb