merge of 'a1d864e39820a6d83791681ce836e11ac38a89b6'
authorKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:14:12 +0000 (21:14 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 14 Sep 2006 21:14:12 +0000 (21:14 +0000)
     and 'db2f843f48cece5e25cf2e654db269ba3dba5192'


Trivial merge