merge of '1381c99b5b235453ffd6d1e9c2eaeae4f080910b'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Aug 2008 13:16:22 +0000 (13:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Aug 2008 13:16:22 +0000 (13:16 +0000)
commit5f83ee8a351204c3de49dd2260263b184e096efe
treece7a89d3252046c9f506d3a6f4f774ae2dcff777
parentca91e2fa2a6f54b2276677d4b2aa0759ad6b35b2
parent0352656061f8be63e4f3c08bbce8beceed86be64
Merge ... '1381c99b5b235453ffd6d1e9c2eaeae4f080910b'
     and 'dbeff9227117d6552a46cabd79dc42643b6feebe'