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)
     and '6c1ed5cfb5510bfd08565e5ff345b53c1cfcfe7e'


Trivial merge