merge of 45523d76f8ab21f3cf758dddb065ea69352fdda6
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jul 2005 10:19:38 +0000 (10:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 10:19:38 +0000 (10:19 +0000)
     and 68eb66f0775ddfc98a09a35fe521ff023060b754


Trivial merge