merge of '159bde97bf43587e841741dc7ae1798e02ad78f6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:22:59 +0000 (10:22 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 13 Sep 2007 10:22:59 +0000 (10:22 +0000)
     and 'b37835d2c741793df9f326066d6f5563e070f405'


Trivial merge