merge of 96fed78607f0529e7177d55147568944ff559a90
authorKoen Kooi <koen@openembedded.org>
Wed, 28 Jun 2006 09:02:47 +0000 (09:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 09:02:47 +0000 (09:02 +0000)
commitea598444584f8fc9fff0ad6b482d761fcc0309c7
tree197de3e7ddd78bc0acb2cedad5ffed3cb52a7166
parent5beeda5a0119ff00a31605465613d7bd15af13ba
parenta4ec0922c99c486493b1a5bb224f315ac7ab9a26
merge of 96fed78607f0529e7177d55147568944ff559a90
     and c2ca1eca3e23b0468ffeab450e6a81d6ca829e45