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)
     and '8e90244a719ea0f6cc33218bf925484a5a4e1855'


Trivial merge