Beware crossing the bridge.

When is a troll not a troll?  I think a distinction can, and should be made between someone who is saying "I know this may upset you, but this is the way I see it.." and someone who is saying "I am saying this because I know it will upset you".  The second is a troll, but what about the first?  I've said before that in my opinion true freedom of speech must necessarily include the right to upset and offend, but where that becomes the primary objective then that is where I feel the line is crossed. Problem is that the line can at times be very vague and indistinct.