merge of 7ba73700ed732b698e688443c1f964454f76f1e8
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 8 Feb 2006 16:00:28 +0000 (16:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 8 Feb 2006 16:00:28 +0000 (16:00 +0000)
commit863ed698204f4bf49f3ae654588c6488aa4b625e
treea798ed9c0e0c5a5093808c69f4bf8cfee6a7736d
parent67bd9f3ceb602c293698f2cf68c48df80a5c3a36
parent1629da56a64f1323816dbe9d051b82c8348bb6f2
merge of 7ba73700ed732b698e688443c1f964454f76f1e8
     and e1e48e54eacd0f943b35dcc20e6b52674bcd69f9