merge of 318d06f263d6957b449ed1f6a10cfdda107bcceb
authorMichael Lauer <mickey@vanille-media.de>
Mon, 12 Jun 2006 18:23:30 +0000 (18:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 12 Jun 2006 18:23:30 +0000 (18:23 +0000)
     and 8bed42c6d1a57ad595de378d393b40c7bd3e997f


Trivial merge