merge of 2b0c75329e8e9e0257dd626d3af2ed2042ff24a4
authorMichael Lauer <mickey@vanille-media.de>
Mon, 4 Jul 2005 13:25:56 +0000 (13:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 4 Jul 2005 13:25:56 +0000 (13:25 +0000)
     and 4f22ecbf9b052611a52b5e12802a2d8a9584cea7


Trivial merge