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)
commitc25b1b3efea1ed12c1953978b7a083f666dc4e68
treefc93771ee64f23c5ae0bb24f72de57bb47655175
parent1388ddb0f747472c631ddd801f13c8a0a6ace4ac
parenta0a6a9203a15e13fcbc60d3f59ad37c59f1d5ba6
merge of 67751448562cee294c455a1ca90add74cc339b78
     and ccbb80bf271c9a4cfead703ac33b9b69e95d755e