merge of '2754e872d313aa16f8b70a6b1475a5fe5cd1b5c0'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 20 Oct 2006 06:57:59 +0000 (06:57 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 20 Oct 2006 06:57:59 +0000 (06:57 +0000)
     and 'f8e3d83965086984baadee15f33b6b7a0bdfe743'


Trivial merge