merge of 73d71ebcee8007b3d2a69a80d4387a817b24d046
authorMichael Lauer <mickey@vanille-media.de>
Mon, 1 Aug 2005 08:50:18 +0000 (08:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 1 Aug 2005 08:50:18 +0000 (08:50 +0000)
     and fc56e135938d8b2230336b4fe9a01d8108180c98


Trivial merge