[MERGE] Minor profiling fixes

[Ian Clatworthy]

Paul Moore wrote:
> exception KeyboardInterrupt
> [...]
> The exception inherits from BaseException so as to not be accidentally
> caught by code that catches Exception and thus prevent the interpreter
> from exiting. Changed in version 2.5: Changed to inherit from
> BaseException.
> """
> 
> Were you looking at an older version?

No - the 2.5 version. On second reading, I just didn't read it carefully
enough. The doc is in fact correct. :-( :-(

Ian C.