merge of 'a06e8907f1fe04daf5997ead2a947bfbdc675a7c'
authorKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 10:19:45 +0000 (10:19 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 25 Jul 2007 10:19:45 +0000 (10:19 +0000)
     and 'a86521780dc35dc231aed40133a626f55b4b3887'


Trivial merge