merge of '2d7ccf067fb2306addce3d751e077c398ca4df93'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:50:51 +0000 (12:50 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:50:51 +0000 (12:50 +0000)
     and 'd0cb7283cf7d2781a86b70c369e0f2ea813e7b9c'


Trivial merge