merge of '5d78367052376f9cb5cf1254ebd88c2b1a03a2e7'
authorKoen Kooi <koen@openembedded.org>
Fri, 29 Sep 2006 20:51:24 +0000 (20:51 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 29 Sep 2006 20:51:24 +0000 (20:51 +0000)
     and 'ab8a258812c46a5d12ee3f0b5fc0de34ecc26d38'


Trivial merge