merge of 'ccc0894b166e387c9e2ae80e0f6e03fee22306d5'
authorKoen Kooi <koen@openembedded.org>
Mon, 11 Sep 2006 08:27:59 +0000 (08:27 +0000)
committerKoen Kooi <koen@openembedded.org>
Mon, 11 Sep 2006 08:27:59 +0000 (08:27 +0000)
commitb8bf48dd4d5e1487a71e9ea39ddfc4b0c0e93923
tree2263a671d4a6ad008d0e3cf833f2c3dbf92d89a4
parent43965e79f2241e65f7d1386896d119c54d5ba72d
parentd2a9e844374b5ddcd08ed8b7716773b223e5bb68
Merge ... 'ccc0894b166e387c9e2ae80e0f6e03fee22306d5'
     and 'd2e1959c4d2d8f9a070ee5db2eedd636d8dc687d'