merge of 2d0c6c5ae9de1c7f719379b1be47dc565de60d41
authorKoen Kooi <koen@openembedded.org>
Sun, 13 Nov 2005 21:08:54 +0000 (21:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 13 Nov 2005 21:08:54 +0000 (21:08 +0000)
commit3d395e29b768d1df8dfd55fe1fcfa5890a4f2db5
treed49932ac8c0fc9e0efe59ad77c5ab507a4da2719
parent1ede4e38cb897f8325758df06d4ca55a6e56d6bd
parent6af8eaf99a757d3883a9a0317e2cabdfc694c22c
merge of 2d0c6c5ae9de1c7f719379b1be47dc565de60d41
     and 81893f6385397851b77ac4dab982e8f0ae5a9198