merge of '14667242175a1d72fe6a6278ffb941a5c170c04f'
authorKoen Kooi <koen@openembedded.org>
Wed, 9 Aug 2006 13:11:18 +0000 (13:11 +0000)
committerKoen Kooi <koen@openembedded.org>
Wed, 9 Aug 2006 13:11:18 +0000 (13:11 +0000)
     and 'f09491a3dc7f40ea6081d29c8983a1cc97e84ad3'


Trivial merge