merge of '5dee8b7dd3218e6fce472b9a9e2455cb3b3765fc'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 17:49:01 +0000 (17:49 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 16 Oct 2006 17:49:01 +0000 (17:49 +0000)
     and '732aabe0b153f8f1b8bb85dc404901cc2c82311b'


Trivial merge