merge of '1401e62254aef0a87a8ce5b685e66d1eb00359e3'
authorKoen Kooi <koen@openembedded.org>
Mon, 1 Oct 2007 12:58:13 +0000 (12:58 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 1 Oct 2007 12:58:13 +0000 (12:58 +0000)
commit02a590aa1c9ebcc12e55f078968eecddd72a9b34
tree01d0f60dd7561ca025f0540ff0f0123744286dc5
parent05b509107f4697d9ec9a6eaae1d8085a197ac57b
parentc6a46d9fc00dccc78b3543ee6c5b62f856bc4c86
Merge ... '1401e62254aef0a87a8ce5b685e66d1eb00359e3'
     and '782254b73af8b1a6dcd10f60816bb473eaf366a0'