A factorial study of salt restriction and a low-fat/high-fibre diet in hypertensive subjects