merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
authorKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:53:23 +0000 (10:53 +0000)
committerKoen Kooi <koen@openembedded.org>
Fri, 7 Dec 2007 10:53:23 +0000 (10:53 +0000)
commit911deca9a4a7865e38bc7cc17e84e04bf4f8d2ff
tree9cfad3cfdbbafca55dacf5736aff6bffc2f56080
parentc16ea23180e220831092ed326a3cfdf79517fd59
parentce8dec58012a1dbf2d23455c140acc7b96abe10d
Merge ... '105955293719b2a1414f1b03af410b8ff8dbdb1b'
     and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'