merge of 4a6e34a69c58c1380bde32bf2842f910ac57223a
authorMichael Lauer <mickey@vanille-media.de>
Tue, 6 Sep 2005 20:55:04 +0000 (20:55 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Sep 2005 20:55:04 +0000 (20:55 +0000)
     and fc9ac3eb2cf63e53ad156ce38ca9a3179c1b347e


Trivial merge