merge of '3b2a4c2d157c55e28c1c710b49f9431e03679512'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 11:33:08 +0000 (11:33 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 30 May 2007 11:33:08 +0000 (11:33 +0000)
commit9c510c394d3df7a8c1570af057a35c24dc0d4e0a
tree8fd4b8979229b01119cd30332503950cd4c4f927
parent036cda450a113e5c31c36517d4e9dec37d5efcfd
parent22ca208912f284149115e93658210cb3954ce42c
Merge ... '3b2a4c2d157c55e28c1c710b49f9431e03679512'
     and '4181e4eed80d3a599e70d00eb9af3049382b8f62'