merge of 2ce5d57fff8a719282f53555ba91fb8e0c04e486
authorMichael Lauer <mickey@vanille-media.de>
Thu, 4 Aug 2005 14:53:59 +0000 (14:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 14:53:59 +0000 (14:53 +0000)
     and 822546375a180bd36198eee43af3f1ad089cfaf9


Trivial merge