merge of '1f133cbc99d6821edfd7e22579fd164020999cb9'
authorKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 10:57:15 +0000 (10:57 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 16 Jun 2007 10:57:15 +0000 (10:57 +0000)
     and '92e57ebaabc8dbb36757843dbe6e0e2bdc042b87'


Trivial merge