merge of 9caf4ba565c754c9654e33192b6bdcc9ca660e06
authorMichael Lauer <mickey@vanille-media.de>
Fri, 9 Jun 2006 15:05:59 +0000 (15:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Jun 2006 15:05:59 +0000 (15:05 +0000)
commit312ea063a8003cb7c6695515cff1925fe79fa577
treefc02768c5bf072c8dac936b1fedc9aca50830981
parentcec882dde15b1b95270d4297fdfabf66cd1bd7e6
parentb83949ae0c5e42b16b3ece300f82d3e0cebee969
merge of 9caf4ba565c754c9654e33192b6bdcc9ca660e06
     and a782d7a4293c6186f8d4d3c9c881e7e07630968b