merge of '871ce36219f0ef5feefc92c1e285f5771c0d1d6f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:21:55 +0000 (11:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 11:21:55 +0000 (11:21 +0000)
commit8f19556367701b3a3fa50802903d0d67997407b7
treef2e294728789ab01a7a89fa06b6c67c5464ceab0
parenta281c38a1adbf8f1c23c9e20467f120b4d2d1741
parent486e00ccba909a4d06d7fad616710523bb86188b
Merge ... '871ce36219f0ef5feefc92c1e285f5771c0d1d6f'
     and 'a2ba360575171f1e6eaf964368bd7edebd9ddecf'