merge of '0fcb36ac99d9411a139d45f77b738646aaab2ebf'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Oct 2006 14:56:14 +0000 (14:56 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Sun, 15 Oct 2006 14:56:14 +0000 (14:56 +0000)
     and '68939422dc88f64f4831bce0644266a1875c335b'


Trivial merge