merge of '60f8ab65a31175b75e99193102e2ec70cbdfdef8'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 26 Jun 2007 09:06:24 +0000 (09:06 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Tue, 26 Jun 2007 09:06:24 +0000 (09:06 +0000)
     and '6417986ed931c354e68da472aabbf608cb98eb63'


Trivial merge