merge of '8c4d9d143b3386e8a9e062fd8917459f5b7958a2'
authorKoen Kooi <koen@openembedded.org>
Sun, 3 Dec 2006 22:24:34 +0000 (22:24 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 3 Dec 2006 22:24:34 +0000 (22:24 +0000)
     and 'd6c00f5b34119df40f96e1c430057fead9087b1a'


Trivial merge