From: R David Murray <rdmurray@bitdance.com>
Date: Tue, 15 May 2012 02:19:10 +0000 (-0400)
Subject: Merge #14766: Add correct algorithm for when a 'time' object is naive.
X-Git-Tag: v3.3.0a4~166
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d91dc623791fd9973b914a57540d89cb986da7c9;p=thirdparty%2FPython%2Fcpython.git

Merge #14766: Add correct algorithm for when a 'time' object is naive.

This patch also clarifies the definition of Naive and Aware.

Original patch by Greg Weller, I modified the first hunk
somewhat to make the exposition even clearer (I hope).
---

d91dc623791fd9973b914a57540d89cb986da7c9