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)
commit49a826fff67c6597b5b7c197a4998bafd4c3c8a0
tree3a5cde803a65b83874f36950fb9512286278f6b5
parent3dd8504250574299942e866fc97ca0dbd8b00413
parent14a6abd7d4c87d51068a61f1dde1019102ac5571
Merge ... '0c89fbedbb59ef7e1b229b833813e59080b4952a'
     and '3fcc18f194a4f1bcbe8cb8c4a82dc5c59d63eaf1'