merge of '2cb5af15b69e039f3a37629ca3a637b05cae7138'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:39:48 +0000 (19:39 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Jan 2007 19:39:48 +0000 (19:39 +0000)
     and '8571d11847894fe4e419cfb25c5ae5accc13e3aa'


Trivial merge