Security fix diffs for 2.x

[Scott Cantor]

Ferenc Wagner wrote on 2009-11-25:
>> They'd be in different C++ namespaces, or could be static members of
>> different classes, or both.
> 
> To my great surprise they actually work together, though currently
> neither is the case (with yesterday's patches).  Behold:

I'd still strongly suggest namespacing them, there's no cost to doing that.

-- Scott