merge of '948a3826e06f14adc54097e1356e07ee2779f1b6'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:34:24 +0000 (17:34 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 13 Oct 2006 17:34:24 +0000 (17:34 +0000)
     and 'a432db96d075c07f39a31ed168e1dfe9996f7a9a'


Trivial merge