merge of 134275ac8282e85c0c6a9e535657f513f7f039c0
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Nov 2005 21:10:55 +0000 (21:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:10:55 +0000 (21:10 +0000)
commitcf317a56b63391420dd5519b8774f7415c872002
treee5a1797f723bf300c549466afa9a9f5a2d9dacd6
parent4a519521113c10547d2135c06ad95450c72689bd
parent37bfd44995253ca84065f0d4326c24ab14f2b1ae
merge of 134275ac8282e85c0c6a9e535657f513f7f039c0
     and 9afd2dba8f4f062cb27df95849c47aa62f3441dc