merge of '0b5587edb6c37bedf357b56ee1438f317f10673f'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 14:04:35 +0000 (14:04 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 3 Sep 2007 14:04:35 +0000 (14:04 +0000)
     and '862b21d8f8b53f723771b71216302b89245e8b8a'


Trivial merge