merge of '15b6f45301fda6f790437001f9294ee5c0aa8b0b'
authorKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 20:42:51 +0000 (20:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 28 Nov 2006 20:42:51 +0000 (20:42 +0000)
commit672985c8e00166b1baf44cbf4870303f3cda29e5
tree2d51acb9bb8ed0aa36f3cfc4d65acb3b7de1bb6f
parent37b0190d7c1f7e77a31686528eb5968f3da47ef6
parente3a528414debc6b763edb288779770c75e7cd763
Merge ... '15b6f45301fda6f790437001f9294ee5c0aa8b0b'
     and '229401407cd5205eaf63199ff76bf8ec83129101'