merge of 6efbfec71e63ee2a821512e58cb523b4ead883d6
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 17:05:53 +0000 (17:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 17:05:53 +0000 (17:05 +0000)
     and c243286c01b3794a7ec43b97e5e8786b2d269083


Trivial merge