merge of '9e08f0a0ea353d01da3e8da16012b96b9e4e2fa2'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 10:50:06 +0000 (10:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Dec 2007 10:50:06 +0000 (10:50 +0000)
     and 'af4d0cf9183578dcd9108ce35fb736fb016e4401'


Trivial merge