merge of ce94922846908c2edd7362a56618ea051b244c3b
authorErik Hovland <erik@hovland.org>
Tue, 23 May 2006 16:52:34 +0000 (16:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 23 May 2006 16:52:34 +0000 (16:52 +0000)
commitf85602e94b6b24559cae12c5ccfc5b22c8bf9d6f
treec66b571d3722fcb09e7bc5d5b17268269da1d7aa
parentfc0711ae1805e4cf8654de0cf8d48b2389990526
parent0ded07b11f6110637773d80e76054683cfc666be
merge of ce94922846908c2edd7362a56618ea051b244c3b
     and f3d0cda096d15213040e8dd3f198a10398314030