merge of 6db5a6f376383e2d73ef38fa86ae25d51699b983
authorRichard Purdie <rpurdie@rpsys.net>
Mon, 28 Nov 2005 21:11:57 +0000 (21:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:11:57 +0000 (21:11 +0000)
commit3c5687e6e457fc5c24b8aaed9f787849f567a10f
treee5a1797f723bf300c549466afa9a9f5a2d9dacd6
parentcfd81d3f13126f9903788d2576a7a499429844af
parent37bfd44995253ca84065f0d4326c24ab14f2b1ae
merge of 6db5a6f376383e2d73ef38fa86ae25d51699b983
     and 9afd2dba8f4f062cb27df95849c47aa62f3441dc