merge of '5071c48a87d5b7fe1522ead80ed52698f40d90af'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Mar 2007 10:55:38 +0000 (10:55 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Fri, 23 Mar 2007 10:55:38 +0000 (10:55 +0000)
commit9ca244720e005906aa4292159689d81ea2dd5751
tree481bbeac69aef28c32ff882d7e585db1c86bca8a
parent97fb19ffc8d0dd9e0fe1d7dce49843dbe50cd04d
parent9840a3458d188fc6c1e44ae7760d9007117dfbea
Merge ... '5071c48a87d5b7fe1522ead80ed52698f40d90af'
     and 'd92df12b19c3a9740bd99582f5b7044cc25f6316'