merge of 86dd0e90cceb760828bde3bc88ed858f8fb41c67
authorMichael Lauer <mickey@vanille-media.de>
Tue, 19 Jul 2005 08:56:13 +0000 (08:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 08:56:13 +0000 (08:56 +0000)
commit3dfda58767143ddfef10ee3521a63cef6083c478
tree77f6daab5507789ac94e645feee87448ef880281
parent101f43eb25f75463ab69a1b2e68959e5cd6cb659
parent8e869b70b908cf60ed699d39b490a8417ecb1a63
merge of 86dd0e90cceb760828bde3bc88ed858f8fb41c67
     and de6df43d5237d8fc582186ad675158ea0b26d1e4