merge of 'd3fa7065b141a0eadc8b300509ed7e4508ac1f95'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 1 Jun 2007 13:52:40 +0000 (13:52 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 1 Jun 2007 13:52:40 +0000 (13:52 +0000)
     and 'eaf3a51c8eeda81e029db9d3d3dbf0d4fd16dfb8'


Trivial merge