merge of '34d07eb5a0a81538143c57486cc515538a4d97ea'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 08:45:48 +0000 (08:45 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 08:45:48 +0000 (08:45 +0000)
     and 'cccbcdee9adebcb074bf6947b2a127fec3260453'


Trivial merge