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)
     and 'dc2a98d301d6e2c9a40551be91b9f32f1ec43133'


Trivial merge