merge of '051aed6118dfe66775aef988fe3b9f0792cf80a9'
authorKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 15:24:42 +0000 (15:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 9 Nov 2006 15:24:42 +0000 (15:24 +0000)
commit7f294e6042d2305e7d24b19ec057f9ab5fa5a2b5
tree43a64165b1a1fa0ce312c465f11ea8e17b7d986b
parent3ef9099e3d8778f6a5b45fdaf59b5aa2b708bdf5
parentbc58d14b9c4242c62699a133a5b2d39b80fced3d
Merge ... '051aed6118dfe66775aef988fe3b9f0792cf80a9'
     and 'fa33212259d3560df37f96b6f67954807659b438'