merge of '4ab3710b70f820537b311ab17eff50c0c82a07a2'
authorKoen Kooi <koen@openembedded.org>
Wed, 18 Apr 2007 21:06:14 +0000 (21:06 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 18 Apr 2007 21:06:14 +0000 (21:06 +0000)
     and 'af9abf7faf7bb6268429bba6d7fcc41eed8b8a69'


Trivial merge