merge of 178f3f0b13daf4d30ab59b4d784ffc9784e60fe3
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Mar 2006 12:48:24 +0000 (12:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Mar 2006 12:48:24 +0000 (12:48 +0000)
commit9f931454814a9bed2877a321d54726d5900a5a05
treebbb3eed2f992ba3bdb2cd1457ee187d7ded6adeb
parent78c672fe882557a70b5a132353bd036223bc5be5
parentcf64b704c29e386a1f3f61d993aa243ec59a7120
merge of 178f3f0b13daf4d30ab59b4d784ffc9784e60fe3
     and ac0da6aa2f71fa6df7ee8952103394d2b4b012ab