merge of '4debfc11cf9e85b98e7395e221cb5044cf8fe49d'
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Dec 2007 08:30:47 +0000 (08:30 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 5 Dec 2007 08:30:47 +0000 (08:30 +0000)
     and '7e45814ce1cb1ed4bb79fe646a4a5546cfa6a5e2'


Trivial merge