merge of 4b06abdf57f4120c272429171977e1efd7378926
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Feb 2006 22:23:36 +0000 (22:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 22:23:36 +0000 (22:23 +0000)
commit99407a381ae2104f665455e5e1d2ec1789a885f6
treefe18bb7cefea129626cde9b49b33079e25b49b54
parente50b34de7f94dd15f9d221ae24bbea21ec97d39b
parent0ad52d9f3f7a57afeef30ec970005edaeca4518b
merge of 4b06abdf57f4120c272429171977e1efd7378926
     and 8fb0e135d3da67bc1fa37bd6ad67902d8cf02bcb