merge of '53526775d6ee970cc212293fcfa79e27b87e4a5b'
authorKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:01:54 +0000 (10:01 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 25 Aug 2006 10:01:54 +0000 (10:01 +0000)
commit7458cd2416ed8b03406f065314ee7981ed61363f
tree222096d1f31029c2b12b1e94ea6525c9a011c5f5
parent6cd8d8fa7a0e88cbf52e0ea4901ad9b4b4686cce
parentca0e6432e64cada147f6131b91ad3da555c10364
Merge ... '53526775d6ee970cc212293fcfa79e27b87e4a5b'
     and 'ded2a6ac420467a4e7a2e1324eec6ccf1037ab27'