merge of 'a2a414dc8c26784dc8f35ecddb62ca87e5d0f634'
authorKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 07:49:23 +0000 (07:49 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 22 Jun 2007 07:49:23 +0000 (07:49 +0000)
     and 'e41ad38990f6485eb33ce1902f7cd10880deba5b'


Trivial merge