merge of '0c89fbedbb59ef7e1b229b833813e59080b4952a'
authorKoen Kooi <koen@openembedded.org>
Sat, 4 Nov 2006 15:12:07 +0000 (15:12 +0000)
committerKoen Kooi <koen@openembedded.org>
Sat, 4 Nov 2006 15:12:07 +0000 (15:12 +0000)
     and '3fcc18f194a4f1bcbe8cb8c4a82dc5c59d63eaf1'


Trivial merge