merge of 8b069f0b5e4fc820af1c8f803a12366dbb47a104
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 May 2006 21:50:39 +0000 (21:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 May 2006 21:50:39 +0000 (21:50 +0000)
     and 9a476ca14bf1cfb6a29b0a506daf400991c515e4


Trivial merge