merge of '48b3ebe818c6d71c00ae88870e198d7a6aaab977'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Jun 2007 13:22:58 +0000 (13:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 4 Jun 2007 13:22:58 +0000 (13:22 +0000)
     and '9601d0f2fa6ac50e61ab50e4be9e17b571aad3f0'


Trivial merge