merge of 03b24ac5bbfd34988917e742c3d058a0e65c9cae
authorKoen Kooi <koen@openembedded.org>
Fri, 10 Mar 2006 22:24:53 +0000 (22:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 10 Mar 2006 22:24:53 +0000 (22:24 +0000)
commit81089c05a2dde5b035426bbcac4865fdca34a209
treed4f752e789d3aaac95a5b232d21f9fcff2353447
parent05537392106bfa338801b7ec0af451601ace917e
parent97ea9e42c5a7213362eaee90b02c722503ccecae
merge of 03b24ac5bbfd34988917e742c3d058a0e65c9cae
     and 89b41334d0c4e264e8d1a5cc4598404379f62dfd