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)
commit4c8c2180d641189cf3c533ad1573b4a98ab1a7cb
treec82d25d835aae400918d27b6d76668491be84d26
parentfc0177440fae7a5562916ee05e4cce2828525b1e
parent4a04521a430f94e504fb7cf92759cad06b8fb61d
Merge ... '60f8ab65a31175b75e99193102e2ec70cbdfdef8'
     and '6417986ed931c354e68da472aabbf608cb98eb63'