merge of '0c449bd860651c16124dcc0cc2cd07689c45f195'
authorKoen Kooi <koen@openembedded.org>
Mon, 7 Jul 2008 19:42:51 +0000 (19:42 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 7 Jul 2008 19:42:51 +0000 (19:42 +0000)
commit1aaa03d906a91f3b00b518d3a5d2260d06a4b750
tree2bf4ec16be12a1a16103f87c54d254f1eddc7429
parenteb2c55d18aec83945069c47dd205bcb857318964
parent1f73b34c676b7bb2864063b83174c07c9a29d7fb
Merge ... '0c449bd860651c16124dcc0cc2cd07689c45f195'
     and 'dd4d3e3ff0ada8bf5ea141fcdcf9a37e621fa46a'