merge of '3c0e078ee39da24a256067ec5c50395619259524'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 06:52:08 +0000 (06:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 06:52:08 +0000 (06:52 +0000)
     and 'ddf801e292cf0442dbd1fe0e9ec66ac87b15dc77'


Trivial merge