merge of '6a20ffdd5a12f195a2bbd1c8cdb586851f2c7ba4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 10:23:12 +0000 (10:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 10:23:12 +0000 (10:23 +0000)
     and 'b5ad5b3bb47b5542ba4265b827bf2fee6dc5e18a'


Trivial merge