merge of 905c8d454a8f78a32652b51edb7d9fc32edc640b
authorMichael Lauer <mickey@vanille-media.de>
Mon, 18 Jul 2005 08:15:26 +0000 (08:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 18 Jul 2005 08:15:26 +0000 (08:15 +0000)
commitc0304ae5a229a4b4b83b107c85e8567bbf471a31
treeb0609fa1d7d3807a32af5b28e25ba17f0dddc38a
parentb4c6b653d6e9ea0cdcdc32837421593863b16141
parent11fbb9b086d25e4d8f5368dbb8e2ec063a07afff
merge of 905c8d454a8f78a32652b51edb7d9fc32edc640b
     and 92e1739bb87cfcdf66038f7860c960bac859d2d1