Merge issue #14900: Distuguish call count and primitive call count in pstat output.

author Andrew Svetlov <andrew.svetlov@gmail.com>

Sun, 7 Oct 2012 15:59:11 +0000 (18:59 +0300)

committer Andrew Svetlov <andrew.svetlov@gmail.com>

Sun, 7 Oct 2012 15:59:11 +0000 (18:59 +0300)
author Andrew Svetlov <andrew.svetlov@gmail.com>
Sun, 7 Oct 2012 15:59:11 +0000 (18:59 +0300)
committer Andrew Svetlov <andrew.svetlov@gmail.com>
Sun, 7 Oct 2012 15:59:11 +0000 (18:59 +0300)
diff --cc Lib/pstats.py
Simple merge
diff --cc Misc/ACKS

index da7a434fa50d019631cae7f8fe72a716d3250dd3,7429f77beb38ae91085be749d6fa256876f48fb3..a17cf73dbb8bd15d00b8e2b8edbdde25ad337b27
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -48,12 -44,13 +48,13 @@@ Alicia Arle
   Jason Asbahr
   David Ascher
   Chris AtLee
+ +Aymeric Augustin
   John Aycock
- -Jan-Hein Bührman
   Donovan Baarda
+ Arne Babenhauserheide
   Attila Babo
- -Alfonso Baciero
   Marcin Bachry
+ +Alfonso Baciero
   Dwayne Bailey
   Stig Bakken
   Greg Ball
author	Andrew Svetlov <andrew.svetlov@gmail.com>
	Sun, 7 Oct 2012 15:59:11 +0000 (18:59 +0300)
committer	Andrew Svetlov <andrew.svetlov@gmail.com>
	Sun, 7 Oct 2012 15:59:11 +0000 (18:59 +0300)
		1	2
Lib/pstats.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/ACKS	patch \|	diff1 \|	diff2 \|	blob \| history