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)
commit5ee5b6f059771aaa6f4f88a4b4e02f314177b93f
treece7082c58767bcfa3cfa57565948838e5f2d7c7e
parent4748e47085afa32bc5d342d28dd2c7d3dede654b
parent0da695117f8a142e6d15601d8d7064ed5c35074a
Merge ... '4681b04a3d2d7f7f51e4bc94ec5d6582ea3ae5e0'
     and '5f9b157c1e6b280d0ed91fc354403a3e900f7f8c'