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)
     and a782d7a4293c6186f8d4d3c9c881e7e07630968b


Trivial merge