merge of 6167902f8756810f12305f33e05925c1b2811f0c
authorKoen Kooi <koen@openembedded.org>
Mon, 28 Nov 2005 21:17:46 +0000 (21:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 28 Nov 2005 21:17:46 +0000 (21:17 +0000)
commit71606ab7069b27f2224efb6f682beaf4846e4aa1
treee5a1797f723bf300c549466afa9a9f5a2d9dacd6
parentcf317a56b63391420dd5519b8774f7415c872002
parent3c5687e6e457fc5c24b8aaed9f787849f567a10f
merge of 6167902f8756810f12305f33e05925c1b2811f0c
     and e57b306d5d33aa84cfa65719890862b92749d01a