merge of 0f9bc56e68821bb651a30e8104863bd4c869dc05
authorMichael Lauer <mickey@vanille-media.de>
Thu, 29 Sep 2005 12:11:39 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Sep 2005 12:11:39 +0000 (12:11 +0000)
     and 60733b040ba9bcfac4ef0384ce2cd7236effb91b


Trivial merge