merge of 6957560e17a99bdee10607797a02209bcfaeed94
authorMichael Lauer <mickey@vanille-media.de>
Thu, 6 Jul 2006 16:19:33 +0000 (16:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 6 Jul 2006 16:19:33 +0000 (16:19 +0000)
     and c6de91971461be680012cd5aa78de999ad8b1684


Trivial merge