Merge
authorRaymond Hettinger <python@rcn.com>
Tue, 12 Apr 2011 22:24:39 +0000 (15:24 -0700)
committerRaymond Hettinger <python@rcn.com>
Tue, 12 Apr 2011 22:24:39 +0000 (15:24 -0700)

Trivial merge