merge of '08c861d0f603db088f96ca2512d224a78406fea6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:13 +0000 (12:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:13 +0000 (12:13 +0000)
commit329787ef9f6b2be615be3a93fec0e2916475445b
treef4e77fd344d501b782ddd330874be4fd949a8465
parent2b55f24fee0d2266fd9cc429b775986f37258362
parent4c12de840646dd2ff12ddcba9663717e9387a28f
Merge ... '08c861d0f603db088f96ca2512d224a78406fea6'
     and '2a763ba11cf69b342a356812987f63bb2053011b'