merge of '3cc9017ec1982d67d07a8059097acd2ee7b8c42c'
authorKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 07:33:42 +0000 (07:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 4 Aug 2006 07:33:42 +0000 (07:33 +0000)
     and '87cb6d5388e06c52d5471051180223acb92bd54e'


Trivial merge