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)
     and 'e756d424cb3aac14f24822fd1d4481b5dc2fa8fd'


Trivial merge