merge of cdbb7877ce270a2160669f6ed055cdd98154f548
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 May 2006 15:07:31 +0000 (15:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 May 2006 15:07:31 +0000 (15:07 +0000)
     and cf54ffcd5816180e831bfbb9a1e93abeb12a62e4


Trivial merge