merge of '6a20ffdd5a12f195a2bbd1c8cdb586851f2c7ba4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 10:23:12 +0000 (10:23 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Thu, 18 Oct 2007 10:23:12 +0000 (10:23 +0000)
commit636a4c11a1e6c776555b0b98e1fcad8e5af93afd
tree0087657302111cb610bd81a1ae4b12d16cec48c9
parent71a3a74a0517bdeac55f9fe4d1ded17a8a83115b
parentee38cb5a4a60471d1e18532b43332b6a42fe3e02
Merge ... '6a20ffdd5a12f195a2bbd1c8cdb586851f2c7ba4'
     and 'b5ad5b3bb47b5542ba4265b827bf2fee6dc5e18a'