merge of '57565ef68b5336bb18f16b962b9646b84daff984'
authorKoen Kooi <koen@openembedded.org>
Sat, 20 Jan 2007 15:53:26 +0000 (15:53 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 20 Jan 2007 15:53:26 +0000 (15:53 +0000)
     and '69802b5fc5dcf27f5b27f6a9a9aadb1f3a808b71'


Trivial merge