merge of 002a1f51b953da649d96ae8ecdac59ea1ae42bd5
authorKoen Kooi <koen@openembedded.org>
Mon, 18 Jul 2005 22:59:16 +0000 (22:59 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Jul 2005 22:59:16 +0000 (22:59 +0000)
commit310d8edbb3d8142c2e24c71097652d2f02792219
tree1625f2287137a6fafc98b247233ee9c5ceeb2a25
parentbdc0886ca344263cd06be258cffaf2bbc66532db
parent488c94400553be4e7bf946430a4783ee7e91f38b
merge of 002a1f51b953da649d96ae8ecdac59ea1ae42bd5
     and e109156250767b8fafcee6f70ed990161ec858d1