merge of '2af10c8f8ecac83cfb23286aebb3172d45a4a12f'
authorKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 13:02:53 +0000 (13:02 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 13 Oct 2006 13:02:53 +0000 (13:02 +0000)
     and '51b5481655e96906c986a4ff927a78ce129f0109'


Trivial merge