merge of '42944a2fa933c39933c8b65cfa592c28efa57387'
authorKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 17:16:42 +0000 (17:16 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 17:16:42 +0000 (17:16 +0000)
     and '5df6035ef92e0f27c836b65338f4cd1a09c506d4'


Trivial merge