merge of '15617f31c93e5e7e35627af8b363148f69541579'
authorKoen Kooi <koen@openembedded.org>
Sun, 10 Sep 2006 08:59:47 +0000 (08:59 +0000)
committerKoen Kooi <koen@openembedded.org>
Sun, 10 Sep 2006 08:59:47 +0000 (08:59 +0000)
     and 'c6bcfdb59d3237f59868cab3ac70dcc8c36efa5a'


Trivial merge