merge of 2ab40f2da7b39983c44422e04888f7b91471b2d7
authorKoen Kooi <koen@openembedded.org>
Sun, 24 Jul 2005 18:17:28 +0000 (18:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 24 Jul 2005 18:17:28 +0000 (18:17 +0000)
commit20578bdadda879474883702ec8e6aa416675785e
treebfa718aa8b77bddbb06bf3a42ac7ff7da36eb744
parent30931c232d0aabfd61ab05195d10feddf709243f
parentcb67f080f98bc8318604bfe17d94cd97bd6b46f1
merge of 2ab40f2da7b39983c44422e04888f7b91471b2d7
     and dd4ebed2bb572edf6af4257b824e42f38c9e3de9