merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:53:23 +0000 (10:53 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:53:23 +0000 (10:53 +0000)
     and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'


Trivial merge