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

Mon Jun 27 16:19:17 CEST 2011

http://hg.python.org/cpython/rev/328fb2bbcd56
changeset: 71014:328fb2bbcd56
parent: 71010:f444313a81be
parent: 71013:adc244036ef7
user: Benjamin Peterson <benjamin at python.org>
date: Mon Jun 27 09:19:02 2011 -0500
summary:
 merge 3.2
files:
 Lib/profile.py | 6 +++---
 Lib/pstats.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Lib/profile.py b/Lib/profile.py
--- a/Lib/profile.py
+++ b/Lib/profile.py
@@ -10,13 +10,13 @@
 
 # Copyright Disney Enterprises, Inc. All Rights Reserved.
 # Licensed to PSF under a Contributor Agreement
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
diff --git a/Lib/pstats.py b/Lib/pstats.py
--- a/Lib/pstats.py
+++ b/Lib/pstats.py
@@ -10,13 +10,13 @@
 
 # Copyright Disney Enterprises, Inc. All Rights Reserved.
 # Licensed to PSF under a Contributor Agreement
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 # http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-- 
Repository URL: http://hg.python.org/cpython
