merge of '3664c8386a83989b0e4b61c25a0c3f5782c2b71f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 13:20:39 +0000 (13:20 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 26 Oct 2007 13:20:39 +0000 (13:20 +0000)
     and 'b968656776ab23ced6e8710b760e509bfc537fe1'


Trivial merge