merge of '49620a480a3c8deee05068287aa90bf723508c27'
authorKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 12:47:13 +0000 (12:47 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 24 Jul 2007 12:47:13 +0000 (12:47 +0000)
commitd50a2a8c2a641ab0987c3ca6dc0074ef07d9f4d5
tree99fabe8d3d1f5bcdb95324134dfa35045a305f25
parent32812c3db0c4ad73c5f240a4eced1f46f4dfaa70
parent2291afee142580fe99e9a3caa7c0521de3d1e7a2
Merge ... '49620a480a3c8deee05068287aa90bf723508c27'
     and 'b8722b34f06f673d698f22dd82b3b225392cfdfb'