merge of 720a8c74ee3b12838375231f9349f202ff0346ba
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Sep 2005 16:14:44 +0000 (16:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Sep 2005 16:14:44 +0000 (16:14 +0000)
     and 722a138341d915ac33993d232e5375f1aa747921


Trivial merge