merge of 8f81c821d4522c9367e23584313e4bbf36557144
authorMichael Lauer <mickey@vanille-media.de>
Wed, 5 Jul 2006 10:32:02 +0000 (10:32 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 10:32:02 +0000 (10:32 +0000)
commit2953a91f058967ca45ec92084b12a6b80b54ea01
tree624d3c23940f94a64e3951ba17d8e246b26e366f
parent5c2a649a5a98bcda32200762b67cf255ece7a18c
parent7ef60a9608007effee6d8edfe1afe375708c128c
merge of 8f81c821d4522c9367e23584313e4bbf36557144
     and aa68ff4c40aba03b1dd84c1e7efb9788ba509f51