merge of 9670e736a83e6a2cd24cf9ee212df96f51b9f7c2
authorMichael Lauer <mickey@vanille-media.de>
Thu, 21 Jul 2005 11:56:43 +0000 (11:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 21 Jul 2005 11:56:43 +0000 (11:56 +0000)
     and d70f182e969169a90e7b31e49ef541b824500c5f


Trivial merge