merge of 'b2043e7a059106dce11b80a41022ab9a738027e4'
authorMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 19:18:16 +0000 (19:18 +0000)
committerMarcin Juszkiewicz <hrw@openembedded.org>
Wed, 22 Aug 2007 19:18:16 +0000 (19:18 +0000)
commit2b383b0690d728c93df9f37189c86a33061d9243
tree54ae35a21db0c1e7ecc57d437fe83bb3f533c36d
parent188df5d022c3a9711b14a8c7b8dc1e841f2d0db6
parent855338fd1e527ad0d04da79bae7871e1db219d86
Merge ... 'b2043e7a059106dce11b80a41022ab9a738027e4'
     and 'f45f0798cde6df6f34666e284a5ebf02d788477a'