merge of '4681b04a3d2d7f7f51e4bc94ec5d6582ea3ae5e0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 24 Oct 2007 13:10:40 +0000 (13:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 24 Oct 2007 13:10:40 +0000 (13:10 +0000)
     and '5f9b157c1e6b280d0ed91fc354403a3e900f7f8c'


Trivial merge