merge of '00349fdb43ae1a7befdd9ed46ef8b8906eb2ad90'
authorKoen Kooi <koen@openembedded.org>
Fri, 5 Jan 2007 18:33:22 +0000 (18:33 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 5 Jan 2007 18:33:22 +0000 (18:33 +0000)
     and '6afc7d70704deaac82cc70ddb91183805e3f8802'


Trivial merge