Should religion be taught in primary and secondary school and how?

I think it only fair and ethical to announce my bias upfront. I am an avowed and ardent atheist although I was raised Christian. I strongly believe religion absolutely should be taught in primary and secondary schools. One major job of a good basic, formative education is to prepare its students for life and everyone at some point or another will be exposed to religious belief systems. Not teaching about religion would be akin to not informing our kids about the Internet and its risks and rewards. Avoiding the topic of religion in conversations about ethics and social studies would be to institutionalize ignorance. However, here is the crucial caveat. That education should not be about indoctrination into a belief system, even the belief system of atheism. It should attempt to foster tolerance, awareness of self and others and, ultimately, promote a solid understanding of how religious belief shapes the world around us today. It should equip students with the ability to think for themselves, decide for themselves and accept the decisions others make too.