A terrorist is not a combatant you don't like because of his religion.
Khadr was a perfectly ordinary soldier defending his country from an illegal invasion. He should have been treated as an ordinary POW.  It is not a crime to shoot invaders in a war.

 Terrorism is killing civilians with the intent of changing their political affiliation. 
~ Caleb Carr, historian