merge of '736e3745c824a8c11dfc76795f69158b8940190a'
authorKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:38 +0000 (09:07 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 29 Aug 2006 09:07:38 +0000 (09:07 +0000)
     and 'aa2272bf90f42c5648bd3b21c7395aeb71f025fd'


Trivial merge