merge of 'e598cc999e9e7eefa6ce1cf9b440e869d9d61d28'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:01:28 +0000 (12:01 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 13 Nov 2006 12:01:28 +0000 (12:01 +0000)
     and 'fed7957a10077b7dd7ba72689833e152fd94d766'


Trivial merge