merge of '0214582b05132b8f733d073082c352b0d19100fd'
authorKoen Kooi <koen@openembedded.org>
Fri, 15 Dec 2006 18:04:47 +0000 (18:04 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 15 Dec 2006 18:04:47 +0000 (18:04 +0000)
     and '14230563337c9e6187dd230e4e3cd50fffd742a8'


Trivial merge