merge of 67751448562cee294c455a1ca90add74cc339b78
authorMichael Lauer <mickey@vanille-media.de>
Sun, 25 Sep 2005 12:50:59 +0000 (12:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 25 Sep 2005 12:50:59 +0000 (12:50 +0000)
     and ccbb80bf271c9a4cfead703ac33b9b69e95d755e


Trivial merge