merge of '2be33b1e41d85f27342ef28ca591afd1055abbcf'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 11:29:34 +0000 (11:29 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 11:29:34 +0000 (11:29 +0000)
commit4c39222f0d5346319086ee710bc9eeabc7060ebb
treeb350b6d55c7395d35ccc930e9cff30f94d20f815
parent498c3fbe34625a3cbdde5409f13884202b4ef3cd
parentb74b0b0584241d62d83ffbdfda2b27f86f683fea
Merge ... '2be33b1e41d85f27342ef28ca591afd1055abbcf'
     and '6c1ed5cfb5510bfd08565e5ff345b53c1cfcfe7e'