merge of 3312c8f3a63ff90c42c1a421b659e0cd17696424
authorMichael Lauer <mickey@vanille-media.de>
Thu, 4 Aug 2005 17:25:25 +0000 (17:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 17:25:25 +0000 (17:25 +0000)
commit019903803d5b8d1fead525d1f0d197b1786c1b8c
treede4f46a19e9285418317d8082d0451d13974048e
parent83b50868b054b91dd4ad9aa3570eb53a302e427a
parent319f88ac01cb5cb3ec90a088705e16c30c686d06
merge of 3312c8f3a63ff90c42c1a421b659e0cd17696424
     and 8691e90bbf4e4ab0587f1abc3e0a4bb9bcdf53df