merge of 27f2a826933d2cb6c774d60011191463985ec017
authorKoen Kooi <koen@openembedded.org>
Sun, 24 Jul 2005 10:02:03 +0000 (10:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 10:02:03 +0000 (10:02 +0000)
commit89297b67351b656ad8a5e1bad01292fad83728ed
treefc4f1186b38988ea42084bb2558a2de07fefb0fc
parent2cd500dfe9b9777b022ad3e9f7f0b0b2eb7267b6
parent46a0643cfe1a867056bef971eaa5d2783de52d6c
merge of 27f2a826933d2cb6c774d60011191463985ec017
     and b56b830a66e07da73eba26b6134ecf0360e9d735