merge of '1065bf1f2e7b3927eac115451e22f3a6cdb43ec2'
authorKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 17:25:20 +0000 (17:25 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 17 Oct 2007 17:25:20 +0000 (17:25 +0000)
commit14120404ccd232f3819cde88ddd637c9b3110d9e
tree79e9041c703cec3a73fd0e03ece1ce33d4cbb485
parent0b9e00a5b58c9a5e711949b983e137af7a30c198
parentc00ac446317b911ab2dd3b6d525e94457cac3547
Merge ... '1065bf1f2e7b3927eac115451e22f3a6cdb43ec2'
     and 'ce6e70caf14f47e77ee67c3e73490db4ade16767'