merge of 857d29a477b23e8bc2f6523391fe6bbcb15cf15a
authorMichael Lauer <mickey@vanille-media.de>
Wed, 28 Jun 2006 19:34:00 +0000 (19:34 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 19:34:00 +0000 (19:34 +0000)
commit7ac0e9d07429726f0c0ecd46db92ef8c46722bc8
treeffee74a9eff496d39370403020c409cad01d91e2
parent7f2aca3a542d0576ae21267aea66ec9dfa499d27
parenta9a4237c73dc47f512fa8bf770a5c6fb6ca00550
merge of 857d29a477b23e8bc2f6523391fe6bbcb15cf15a
     and 89e400b6f42a60c37056051e437ba68603f0727f