merge of aa18ee8eb2023a276ade17e86029f95c7bd44e9b
authorMichael Lauer <mickey@vanille-media.de>
Thu, 29 Jun 2006 15:48:20 +0000 (15:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Jun 2006 15:48:20 +0000 (15:48 +0000)
     and c7ec779da9615eb36704166a03857d716d9a2908


Trivial merge