merge of '315f8d949ff4e2e3c22ae6f04a8b05818b5a7403'
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Dec 2006 16:56:59 +0000 (16:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 26 Dec 2006 16:56:59 +0000 (16:56 +0000)
     and 'c1c4d0a65a54044d7912fc57f4f76f391fb4df16'


Trivial merge