merge of 0acfb1eebc2f685a59a9682d0c0ca5f04720f21a
authorMichael Lauer <mickey@vanille-media.de>
Fri, 19 May 2006 21:08:13 +0000 (21:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 May 2006 21:08:13 +0000 (21:08 +0000)
     and 7dfb32275ca87df4dc04d3f00b404e30e92e677a


Trivial merge