merge of '0a38e7566051393faa3d7b2924eecdf612c4c021'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 13 Jun 2007 08:06:29 +0000 (08:06 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 13 Jun 2007 08:06:29 +0000 (08:06 +0000)
     and 'b1f3f390dc5b827a9150f1505d6710782551944d'


Trivial merge