merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Nov 2005 21:15:25 +0000 (21:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:15:25 +0000 (21:15 +0000)
commit4a519521113c10547d2135c06ad95450c72689bd
treee5a1797f723bf300c549466afa9a9f5a2d9dacd6
parent82b057a809f2082409f2689cf07de70058087b07
parentcfd81d3f13126f9903788d2576a7a499429844af
merge of 264f8902da57233dad1ce1345495ca9e2fa6e2d4
     and 6db5a6f376383e2d73ef38fa86ae25d51699b983