merge of '3d939eee6aecc2b2d2d099a3f29faf68ba2b347b'
authorKoen Kooi <koen@openembedded.org>
Mon, 20 Nov 2006 18:08:50 +0000 (18:08 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 20 Nov 2006 18:08:50 +0000 (18:08 +0000)
     and '630c8f4d885ea00cf76713379d5b1b9f9ccbe20c'


Trivial merge