merge of 2022049443b7792bb0aa83a3718b39fa33c7a995
authorMichael Lauer <mickey@vanille-media.de>
Mon, 11 Jul 2005 17:27:18 +0000 (17:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 11 Jul 2005 17:27:18 +0000 (17:27 +0000)
     and 9d0d3641c8a092e15958fde6df3c0a92fc97a122


Trivial merge