merge of '00d78946cd1515dee27466d89f128fdb53cca857'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 13:39:31 +0000 (13:39 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 4 Jan 2007 13:39:31 +0000 (13:39 +0000)
commit0555065cdd667532d77684a79b931f6dc5f25cd6
tree3954966ae4167d7d64420d949022781dd2186670
parent1a4cc8ee9bf959e68b7c418d562f70fd6e08d561
parent2c28852f2c640ff585800fc2b9a005be1ae47b6c
Merge ... '00d78946cd1515dee27466d89f128fdb53cca857'
     and 'ef1a4a2342c9bd1b81be3adf9d3bf41a56e6aacd'