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)
     and de6df43d5237d8fc582186ad675158ea0b26d1e4


Trivial merge