merge of 03b7b6de8867ce08c1e283e916d64764e390c898
authorKoen Kooi <koen@openembedded.org>
Fri, 28 Apr 2006 11:10:11 +0000 (11:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 28 Apr 2006 11:10:11 +0000 (11:10 +0000)
commit824b2bef56d52ceb2900dc2d28a421470df7a0c4
tree1aff15c242ec18d2935615a7adc54bbb1ed5db3f
parentd3412c59a395d68fce7df517662508044910b681
parent5e67efef381f4a5a4144cc85d00a920d9d25aeff
merge of 03b7b6de8867ce08c1e283e916d64764e390c898
     and cb46841214d74586c2ece7859e359ec795fd146b