merge of '77bf6cf9356d5ff7595faaf06c5e8138020cb353'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Dec 2006 12:31:36 +0000 (12:31 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Dec 2006 12:31:36 +0000 (12:31 +0000)
     and '9a127619747044880301661798d91082df6b5d72'


Trivial merge