merge of '383183a2b07cc7894a0c38bf198acc5f5f97fec1'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 09:10:39 +0000 (09:10 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 10 Mar 2008 09:10:39 +0000 (09:10 +0000)
     and 'c8a04b4c21aa3cccc256c033dc9532d6dc88be53'


Trivial merge