Logged In: YES 
user_id=3066

Interestingly, your patch gets the sense which object is
bound to __builtins__ in what context reversed.

I've modified the patch a bit to correct that and make the
warning about direct use of __builtins__ visually stronger
(at  least in the HTML format).

Committed to the trunk as revision 46826, and to the Python
2.4.x maintenance branch as revision 46828.