merge of '243cd3c062dedab306729396ebc2e44a5b81f1e9'
authorKoen Kooi <koen@openembedded.org>
Mon, 8 Jan 2007 16:48:26 +0000 (16:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 8 Jan 2007 16:48:26 +0000 (16:48 +0000)
commit6d85754a1b9aa052f5a4cd7b23c43110ea15638c
tree8f5478166d7723bf6b31c76f990ae9dad30d799a
parentcfb2bd5dd31e6664b9239c123a0223252d60d5bf
parent91a384736878c610eafb9218787f1a580b4364ae
Merge ... '243cd3c062dedab306729396ebc2e44a5b81f1e9'
     and '6483d4d1753ce1d08be64fec9c95489015da580f'