merge of 36cb9cba2fd4c56a699cbd4285642c1a6f1fa710
authorMichael Lauer <mickey@vanille-media.de>
Mon, 10 Apr 2006 13:40:38 +0000 (13:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 10 Apr 2006 13:40:38 +0000 (13:40 +0000)
     and 6412fbc6b6ef09f97014f02c61ab03c743c2e265


Trivial merge