merge of '22a005b824014688c2c41c2dba34c42bf145a946'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 8 Aug 2006 09:21:26 +0000 (09:21 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 8 Aug 2006 09:21:26 +0000 (09:21 +0000)
commit1adf1c842a2e0ba55b4f01a9c12f0e3096bf0628
tree07a76d417747ccb8ae2273a3ca35ffff463a59d2
parent8979ceed2e9ed94a2022a1c760bdec38e16e05d0
parente1aa79108dc9335cee9aab3d0e5d60e8de473c46
Merge ... '22a005b824014688c2c41c2dba34c42bf145a946'
     and '8e90244a719ea0f6cc33218bf925484a5a4e1855'