merge of '4da6387963b0050f0f62cbd7daa0a2826339e342'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Nov 2007 13:22:54 +0000 (13:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 12 Nov 2007 13:22:54 +0000 (13:22 +0000)
     and 'bff6f2c3b18977b23d686ec5fb277c0bd904bb5c'


Trivial merge