merge 3.3

diff --cc Python/ceval.c
index 5f49615872b66699a4dc1b36e8297a888b8c9a85,73925dc41392beb1086b6c212611842de8db35c7..d4d8466e25d0289ce42dcb8f84a07008de9bf23e
--- 1/Python/ceval.c
--- 2/Python/ceval.c
+++ b/Python/ceval.c
@@@ -2715,8 -2571,9 +2715,8 @@@ PyEval_EvalFrameEx(PyFrameObject *f, in
              DISPATCH();
          }
  
 -        TARGET(WITH_CLEANUP)
 -        {
 +        TARGET(WITH_CLEANUP) {
-             /* At the top of the stack are 1-3 values indicating
+             /* At the top of the stack are 1-6 values indicating
                 how/why we entered the finally clause:
                 - TOP = None
                 - (TOP, SECOND) = (WHY_{RETURN,CONTINUE}), retval