merge of '5f21c437aa0fff306d71bc8a8df1b5108b220a05'
authorKoen Kooi <koen@openembedded.org>
Tue, 7 Nov 2006 12:19:58 +0000 (12:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 7 Nov 2006 12:19:58 +0000 (12:19 +0000)
     and '9bb2161deb1eda6a77ebfd26459243bc0120aeae'


Trivial merge