merge of '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
authorKoen Kooi <koen@openembedded.org>
Thu, 7 Aug 2008 11:14:47 +0000 (11:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 7 Aug 2008 11:14:47 +0000 (11:14 +0000)
commit9000ac7f4d6c3b230c1845b07725113c420b4981
tree6bf5f8113d9fade1af5bbdaaab23f494b681f814
parentd0e8cbe858493dc40709e264a7b25ba89866e0f8
parent75c31cfbfe04621d2be4a905ac74eddb1cb2a48b
Merge ... '5a2fb2965a905224af0a1e26d73f342ecf8944e8'
     and '6fc6bb1fff3ea7b5546ddedf048c33f9a287ac15'