merge of '01f644d2342bc10e83344874b38bcf616e576ad1'
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:52:38 +0000 (15:52 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 4 Aug 2007 15:52:38 +0000 (15:52 +0000)
     and '373f8ffa5274d65898c8263d4e8f9b7e6edc7ac5'


Trivial merge