merge of 'bf8790b0b16ee7e79a7ef29a775d55ffeabcb9a2'
authorKoen Kooi <koen@openembedded.org>
Sat, 26 Aug 2006 21:18:29 +0000 (21:18 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 26 Aug 2006 21:18:29 +0000 (21:18 +0000)
commitcdc1540fc3663a231dcc22bc9b95dc94473bd817
tree04297980942e23e974ab08f8ed6288c90daa755c
parent553620188432efddff8026b8afe4c07b4adc3913
parent04a0af140ea6b29dac41a393c97e77a5b17ad8ef
Merge ... 'bf8790b0b16ee7e79a7ef29a775d55ffeabcb9a2'
     and 'e756d424cb3aac14f24822fd1d4481b5dc2fa8fd'