Mean-Variance Analysis and the Diversification of Risk