merge of 'd0a5769f631be6669cccf0f43f7161eb8c9b64a1'
authorKoen Kooi <koen@openembedded.org>
Thu, 26 Oct 2006 16:16:11 +0000 (16:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 26 Oct 2006 16:16:11 +0000 (16:16 +0000)
     and 'f4f9a857ac1b912526c513320ec90f90bea87d37'


Trivial merge