merge of '89852768a5c62b0d92f57ecb8aa98eecfba1c740'
authorKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 12:55:30 +0000 (12:55 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 15 May 2007 12:55:30 +0000 (12:55 +0000)
     and 'd03e5ca1084f5be98ee7abe28783d5017ed90397'


Trivial merge