merge of 5b9f262d058d326dc272b37c6613728556effa9c
authorMichael Lauer <mickey@vanille-media.de>
Thu, 11 Aug 2005 20:45:15 +0000 (20:45 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 20:45:15 +0000 (20:45 +0000)
     and f4976c9f1b5d682c92d9f4241affb718217f1074


Trivial merge