merge of 609271c40b312ab6442f49fa8fcf91b9de016933
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Sep 2005 10:23:32 +0000 (10:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 10:23:32 +0000 (10:23 +0000)
commit48562ec91aa2f738f64e0e7ab0f006101c22655e
treed4920ecb6e8f91012d554c59ca841812ec8a4776
parent2958e36d6fa99af4d5b70e9dac22013ca80158b0
parent8ede563e65a8b5dfbfbd1daaf4dff8aed3e3a8e9
merge of 609271c40b312ab6442f49fa8fcf91b9de016933
     and ad9133020a1a5b111af22c9ecb30c8ce1e428169