merge of '604e4566ff77ba4e877e134951341dca1fbf145e'
authorKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 16:43:33 +0000 (16:43 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 4 Aug 2008 16:43:33 +0000 (16:43 +0000)
     and 'f2ceedc03b70c983dbbb20c9f461a7f40d0941e7'


Trivial merge