merge of '627199fbe7856e67f8ca9485039c90a227b48598'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Jul 2007 11:55:08 +0000 (11:55 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 2 Jul 2007 11:55:08 +0000 (11:55 +0000)
commit00b48919d080de5b7619ac58c231fa78627445ca
treedcc0cab6726e6f56b544bab0136355ecb6a11e40
parent5b82b2475954a724071fcae3763d3f314c052e70
parent96bd5e4eba2e8cf2a1f57e0799c08d3479985a32
Merge ... '627199fbe7856e67f8ca9485039c90a227b48598'
     and 'c26b01670f3bc8836f1ec27d0de85f3743d9d523'