merge of '171c5d74e25e7c161bf23648620a923e90cfcc5b'
authorKoen Kooi <koen@openembedded.org>
Fri, 11 Jan 2008 07:31:27 +0000 (07:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 11 Jan 2008 07:31:27 +0000 (07:31 +0000)
     and 'e52ff8ea262ab9963525b0a0f6ac0f631d53e597'


Trivial merge