merge of 5c853caed3eb7f82f8393ee8dd12837a0ffab8b9
authorMichael Lauer <mickey@vanille-media.de>
Fri, 5 Aug 2005 11:44:24 +0000 (11:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 5 Aug 2005 11:44:24 +0000 (11:44 +0000)
     and bdc1b4daae6c0dc9020f74804c53a21cd9c61212


Trivial merge