merge of '556711700dc782e2a3dae33b581a0f4b9d3bca2d'
authorKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:48 +0000 (09:36 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 8 Oct 2007 09:36:48 +0000 (09:36 +0000)
commit438e5f64402239782ab636d0bbafcbea98ec2e50
treeef2c4c0260d0086b5833024426b68cd10b69c0d7
parent13cab71c3d93636ac0775fb38af1c2bdda2ae08c
parent96b23ad47d6d5f7e4ac962b8a7713f40c69da045
Merge ... '556711700dc782e2a3dae33b581a0f4b9d3bca2d'
     and '9cb28749b896afea4fb911d08a7bb6f26df50332'