merge of '68d786d826a65a1207a0d57228f667514ce0e74b'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 08:59:10 +0000 (08:59 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 08:59:10 +0000 (08:59 +0000)
commite287840babfb3ad53bc80584bf55e665102dc862
treebf467a4dff5908b40f1f3285c98ce04949e5f498
parent679286315b28017456411ceb604e88b95e989605
parent0ccec93933e3e19b8d2283abad92b2d5c853a8d6
Merge ... '68d786d826a65a1207a0d57228f667514ce0e74b'
     and '9bffa04e210205375d9a75632e31368255316a3b'