merge of 2fcf6fe8d1d98bbe857dbbd186838951682572e9
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Aug 2005 21:24:15 +0000 (21:24 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Aug 2005 21:24:15 +0000 (21:24 +0000)
     and 3b9315d4df23473fc5551d996c8624f0927d0dfb


Trivial merge