merge of 'b85e20731701ef2d7dc18d059fe5b5cd0e2eb8ac'
authorKoen Kooi <koen@openembedded.org>
Thu, 31 Aug 2006 08:13:59 +0000 (08:13 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 31 Aug 2006 08:13:59 +0000 (08:13 +0000)
     and 'c43717e39b2264f3f2b9c639768c9aa1c74bc48e'


Trivial merge