merge of '8c0da7de9130cf6ce338544b5a8d83595a1fd839'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 15:26:55 +0000 (15:26 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 20 Nov 2006 15:26:55 +0000 (15:26 +0000)
     and 'fa6299477f4dc9026d80a08ac4d4494c8c32eb64'


Trivial merge