merge of '1f4e0f888e7980338bb85c2dec1e2387e28fc91b'
authorKoen Kooi <koen@openembedded.org>
Fri, 1 Jun 2007 15:01:26 +0000 (15:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 1 Jun 2007 15:01:26 +0000 (15:01 +0000)
     and '61320145c8e5ea3c80d409d857d23c62daf28d45'


Trivial merge