merge of '2040fbc4df2aa380693c353ed60010c6857265d0'
authorKoen Kooi <koen@openembedded.org>
Wed, 27 Dec 2006 17:48:05 +0000 (17:48 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 27 Dec 2006 17:48:05 +0000 (17:48 +0000)
     and '42910a78bf244958e7c8329dfa9474915a321d73'


Trivial merge