merge of '6b88eb96e13fd36fb152748d49b315d3e58466c8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 19 Nov 2007 15:02:16 +0000 (15:02 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 19 Nov 2007 15:02:16 +0000 (15:02 +0000)
commit383acfd52cbc12fa8c9994253ba7a8b72515a257
tree58ce77500c5637522ba88b47fd556e6702f12443
parentb307f554e70862d86eb71f3d7f147a9151f8e554
parentef0fa6e20bf05c3f2553b87e123dde8f9d35c312
Merge ... '6b88eb96e13fd36fb152748d49b315d3e58466c8'
     and 'dc2a98d301d6e2c9a40551be91b9f32f1ec43133'