merge of 381601652b317baceda945983007efd557415021
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Jul 2005 12:08:59 +0000 (12:08 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 29 Jul 2005 12:08:59 +0000 (12:08 +0000)
     and e56174b33bfcc4e2ed05f97322cf481ccaaf624a


Trivial merge