merge of 4fe4838753ca7f23c9801afa9ecc94acdb3f3e2f
authorKoen Kooi <koen@openembedded.org>
Thu, 21 Jul 2005 23:52:53 +0000 (23:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 23:52:53 +0000 (23:52 +0000)
commit70a456d4bce1993048edd449e92b0aaa2535784d
tree8e3932173f33b40b2738568bc5dfb4f768ebc47f
parent14f9b373b7fabee52424efa1f6fb36f540528ba9
parentae2939b595b60a4c3b9dbbf6deb33dc43d49e669
merge of 4fe4838753ca7f23c9801afa9ecc94acdb3f3e2f
     and c5b641f12e4ed0db849b6c4b6b75b5babd603514