merge of 'a6f1d179d5b142243bfd53363872c06f4207c8da'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:38:08 +0000 (11:38 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 11:38:08 +0000 (11:38 +0000)
     and 'ccbf52e8ded1b509f617e8d8e81fd0b4045bcff7'


Trivial merge