merge of '28e5885cc223a5b50756427564336ed39035d498'
authorKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 14:10:51 +0000 (14:10 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 14:10:51 +0000 (14:10 +0000)
     and '8cdc9906876cb88040360ad2c43a38608055f2b4'


Trivial merge