merge of '6516a85d1d78f28686ffc271f1b433d8bc839bd1'
authorKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 16:55:37 +0000 (16:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 5 Aug 2008 16:55:37 +0000 (16:55 +0000)
     and 'df082d3d98bc922e6be0b10b2470f6fa81c5dd64'


Trivial merge