What is the safest way to carry enough water for an extended trip?

For years I've been getting by with using the big plastic water containers from Reliance. But now that I'm planning an extended trip into Baja this fall, I thought I'd better get a jump on better options. Any thoughts on the safest way to carry enough water for an extended trip?

- Tony in Los Angeles, via Twitter