merge of '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 10:50:06 +0000 (10:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 10:50:06 +0000 (10:50 +0000)
commit7341d3036100dddf4fc772a636e084608d85774d
treee7004e5b5fbab63801411f404b5fcdc1983eedf0
parentf18c67d5ef73c90a17648feeaf14ce8ebaca1eb7
parent5449969b61371e504c6e48e881e0be60717a7c3e
Merge ... '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'
     and 'af4d0cf9183578dcd9108ce35fb736fb016e4401'