merge of 024765e1dedb38db9ab1fa38f91d192e8c340dfb
authorMichael Lauer <mickey@vanille-media.de>
Tue, 23 Aug 2005 12:00:45 +0000 (12:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 Aug 2005 12:00:45 +0000 (12:00 +0000)
     and 3fc63b4e706cb671fbd1f5a6170be7a7a3473c92


Trivial merge