merge of '08c861d0f603db088f96ca2512d224a78406fea6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:13 +0000 (12:13 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 12:13:13 +0000 (12:13 +0000)
     and '2a763ba11cf69b342a356812987f63bb2053011b'


Trivial merge