merge of a0bb6704d46edd06e3acb50139d67212a028aa50
authorKoen Kooi <koen@openembedded.org>
Thu, 29 Jun 2006 18:19:14 +0000 (18:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 18:19:14 +0000 (18:19 +0000)
commitcbe5e91953b85e141b7823e4c00c896b42b6a91e
treed0d9d402a963e8b0a5a77f876aabdcaedd97b417
parent41e00ae43c5f7f5142f9ffc88eff49a2fbf32fa4
parent255f7dd6f119ad5f3f476f7aca60c23d78c3816c
merge of a0bb6704d46edd06e3acb50139d67212a028aa50
     and ec186ae975c7b81c6668e0e2e7ba362a9801af90