[Python-checkins] cpython (merge 3.3 -> default): merge with 3.3

[georg.brandl]

http://hg.python.org/cpython/rev/417903cb287e
changeset:   85995:417903cb287e
parent:      85993:56ddb9f6c51f
parent:      85994:b79f68d075c3
user:        Georg Brandl <georg at python.org>
date:        Sun Oct 06 09:17:52 2013 +0200
summary:
  merge with 3.3

files:
  Doc/library/profile.rst |  4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)


diff --git a/Doc/library/profile.rst b/Doc/library/profile.rst
--- a/Doc/library/profile.rst
+++ b/Doc/library/profile.rst
@@ -600,8 +600,8 @@
 
 .. _profile-timers:
 
-Using a customer timer
-======================
+Using a custom timer
+====================
 
 If you want to change how current time is determined (for example, to force use
 of wall-clock time or elapsed process time), pass the timing function you want

-- 
Repository URL: http://hg.python.org/cpython