A farmer planted 2/5 of his forty acres in corn and another 3/10 of his land in wheat. Taken together, what fraction of the 40 acres had been planted in corn or wheat?