merge of '35958473cb3e7c22ae3b948f47dcd57d676d22a0'
authorKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 09:40:27 +0000 (09:40 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 2 Oct 2007 09:40:27 +0000 (09:40 +0000)
     and 'dd9786d58f303cdd2d0ff136859e41e1b6558b66'


Trivial merge