merge of 'a65c738fddaff369abdad3492d66bdf8f6144220'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:22:32 +0000 (10:22 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:22:32 +0000 (10:22 +0000)
     and 'c10bc253a7bbce446d6227ef3562f7534d456782'


Trivial merge