merge of '3b5717e88b7dc6248a4a04b0383da3e66cb7e025'
authorKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:08:02 +0000 (16:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 10 Aug 2006 16:08:02 +0000 (16:08 +0000)
commit646df81c739bf416fb8ec144bc11eb555dcc0cac
treeb2fff7090da418e61070a1a1fbf7b4057a131882
parentce938bdbba1c2a843c6f6f1b2ef2ab58113cf0dc
parentfb92a644ecca72e97196718969115af7fd6bc837
Merge ... '3b5717e88b7dc6248a4a04b0383da3e66cb7e025'
     and '4b00e5d9fb0f4824f24d6a7a5ba99b8f6b40d677'