merge of 9382a38f6527ac52dbb3b04c1ccd0854c14c1e5c
authorMichael Lauer <mickey@vanille-media.de>
Wed, 10 Aug 2005 18:04:22 +0000 (18:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 10 Aug 2005 18:04:22 +0000 (18:04 +0000)
     and cfbd36ce13c068634dfe838d6e4d7e1980011a9b


Trivial merge