merge of '59341f601c1006b473e6599023cd3870fec6ff99'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:20:40 +0000 (15:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 22 Feb 2007 15:20:40 +0000 (15:20 +0000)
     and 'eb5211066eab924478ebbdc53748a8615e528b02'


Trivial merge