merge of 0d3287a95928eaa1b09e468ef501316c65f16248
authorKoen Kooi <koen@openembedded.org>
Sat, 23 Jul 2005 00:15:01 +0000 (00:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 23 Jul 2005 00:15:01 +0000 (00:15 +0000)
commit94fc3b85d8e58f9d74cb5dbd77e699043ddb9c7d
tree7e699d5bbe72bfa3e914b642fec4a04383654c59
parent6f04daf899c1100d9bb9c14cf6ccbd3fcea5b4a6
parent5dde0ce2044f763504169167ea2334b1992e4c61
merge of 0d3287a95928eaa1b09e468ef501316c65f16248
     and cbef9868f39475daf5757782cffc09d98cecb99d