Afstan post- 2011: No military mission or no military "combat" mission?

Further to this post by Milnews.ca (more here),

Post-2011 Mission Heading Back to the House of Commons....

I am becoming really maddened by the government's refusal to stop dancing around with words and come clean. Foreign Minister Cannon:

...
Our position is clear. The military combat mission will end in 2011.

Prime Minister Harper:

...
"Canada's military mission in Afghanistan will end in 2011," Harper told reporters. "And we will not be extending the military mission, period."...

Which one is it, for pity's sake?