merge of '4447992dd58cf24ab0fb99dba811074b21c6aa2e'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 24 Oct 2007 11:40:11 +0000 (11:40 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 24 Oct 2007 11:40:11 +0000 (11:40 +0000)
     and '978814b6112fa21afb021154c869d766d3db1175'


Trivial merge