merge of 6564927a60e6ae419e0ce8e3df08a4d778c193bc
authorMichael Lauer <mickey@vanille-media.de>
Thu, 1 Jun 2006 22:52:43 +0000 (22:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 Jun 2006 22:52:43 +0000 (22:52 +0000)
commitaa27b6f89d69864e710637d7411a7a1bcf5a537e
treef19ab7ff533a2342bf4307aeec07b3dfbf40ae79
parent6f82620c320b6a61c08ffcf80f703841d0f6b30e
parent11d10b76a70aedd9136101fc081dc968d3d7a110
merge of 6564927a60e6ae419e0ce8e3df08a4d778c193bc
     and cc55c113a93ff0cca026956716e79f0fecb52ad2