merge of '86b0497d4fe52237e4f52c1f3b0086f931a8720f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:54:12 +0000 (10:54 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 7 Mar 2008 10:54:12 +0000 (10:54 +0000)
commitf4d4e808eef48613ba91e950aa0b01ca0674bb39
treede0a5e7596e5b60cccc0ed5654d0379a3e9e57dc
parentbe3ea0c1dad004e8ad2e5ea113880e3769fa2b18
parent47a07d0845784c149a4333b05fa001afc5f9b375
Merge ... '86b0497d4fe52237e4f52c1f3b0086f931a8720f'
     and 'a9d5f0dcb0f1b73518569a304f263ac4f3e2819a'