merge of '75f97628b011932079037cb5e552c4a16fb02a02'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 11 Oct 2006 12:54:28 +0000 (12:54 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 11 Oct 2006 12:54:28 +0000 (12:54 +0000)
     and 'acbcf196742b1924b6aad15971f926d940604308'


Trivial merge