South African 'truth' row resolved