merge of 'dd905d1faac53a401f49cb464e9668c7754e986b'
authorKoen Kooi <koen@openembedded.org>
Fri, 8 Dec 2006 08:11:25 +0000 (08:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 8 Dec 2006 08:11:25 +0000 (08:11 +0000)
     and 'f14146eea70011b4bb6773d8401d0068d551f29d'


Trivial merge