merge of '315f8d949ff4e2e3c22ae6f04a8b05818b5a7403'
authorKoen Kooi <koen@openembedded.org>
Tue, 26 Dec 2006 16:56:59 +0000 (16:56 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 26 Dec 2006 16:56:59 +0000 (16:56 +0000)
commit729fb4872a95d30f8197c96b04282a8ea28943c0
tree01b7970682b2cdfc3a9fb6935dca8fcbf124ca46
parent1b73b56f62b2308b724caba2e567ba17f44503a9
parent367efff872c112572bc4e54a2e3ef4cb4578fb14
Merge ... '315f8d949ff4e2e3c22ae6f04a8b05818b5a7403'
     and 'c1c4d0a65a54044d7912fc57f4f76f391fb4df16'