merge of 1f12dbd1bf0fd30504f661a5c169a9551e06202b
authorKoen Kooi <koen@openembedded.org>
Fri, 12 May 2006 07:11:30 +0000 (07:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 12 May 2006 07:11:30 +0000 (07:11 +0000)
commit3a3b4601135f158d70f14e12d2b27107ab895f14
tree07cd1f5a06f19041653b993483757eac35092b4b
parent75bffcf311487808f51e3ecb09d7401062a73513
parentc87de4ed990d8a621082a346a40a0db0c52d94eb
merge of 1f12dbd1bf0fd30504f661a5c169a9551e06202b
     and 4ee0eea0ff207e681c6c5b09e879932e2a91b42b