Have you found Historical Thinking Matters yet? I just introduced this website to some of my students. It is the best thing I have seen for teaching pre-service history teachers how to teach historical thinking skills.
The site is yet another digital resource produced by the Center for History and New Media at George Mason University. Another brainchild behind the site is Sam Wineburg, author of Historical Thinking and Other Unnatural Acts.
If you teach teachers, or if you are a teacher, you need to bookmark this site.