I think that the most effective form of learning tolerance is understanding. As a catholic turned atheist, I realize that the foundation of my morality and ethics was built by my religious education. These fundamentals are things that I would like to see the next generation exposed to, without the identification of any theistic component.
For those that would like to see religion brought back into the public sphere and school systems: think about the role your faith plays in the education of your child. Without the imposition of a singular theology we can incorporate the ideals of community and humanity.
I envision this course would teach morals, ethics, other cultures and lifestyles. It would involve the students in community service.