merge of '59db29c2fbf652e798bf9169df311698fabe2566'
authorKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 12:28:37 +0000 (12:28 +0000)
committerKoen Kooi <koen@openembedded.org>
Thu, 19 Oct 2006 12:28:37 +0000 (12:28 +0000)
     and '78ec88afd42374dfbb8fb0890c47708bbad15959'


Trivial merge