merge of e9dd020fc3fd113d6a079b11a238249de03ff731
authorMichael Lauer <mickey@vanille-media.de>
Mon, 8 Aug 2005 15:16:40 +0000 (15:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 8 Aug 2005 15:16:40 +0000 (15:16 +0000)
     and f9d3b94ab86532d41ac3eded503c6e47d6d8de4c


Trivial merge