Benjamin Peterson 9451a1c6ae Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ........ r77967 | vinay.sajip | 2010-02-04 12:48:53 -0600 (Thu, 04 Feb 2010) | 1 line Logging: Implemented PEP 391. ........ r77969 | vinay.sajip | 2010-02-04 14:18:28 -0600 (Thu, 04 Feb 2010) | 1 line Removed spurious print statement. ........ r77973 | vinay.sajip | 2010-02-04 14:23:45 -0600 (Thu, 04 Feb 2010) | 1 line Issue #7851: logging: clarification on logging configuration files. ........ r77979 | vinay.sajip | 2010-02-04 15:40:56 -0600 (Thu, 04 Feb 2010) | 1 line Added unit test for cfg:// resolution. ........ r77985 | vinay.sajip | 2010-02-05 08:52:05 -0600 (Fri, 05 Feb 2010) | 1 line Issue #7857: test_logging: listener test now uses find_unused_port(). ........ r77986 | vinay.sajip | 2010-02-05 09:40:20 -0600 (Fri, 05 Feb 2010) | 1 line Issue #7857: test_logging: listener tests disabled for now. ........ r78009 | vinay.sajip | 2010-02-05 17:43:11 -0600 (Fri, 05 Feb 2010) | 1 line test_logging: minor tweaks to timeouts, listening tests marked as skipped. ........ r78029 | vinay.sajip | 2010-02-06 14:00:43 -0600 (Sat, 06 Feb 2010) | 1 line Issue #7857: Tentatively re-enabling one test to see effect on buildbots. ........ r78031 | vinay.sajip | 2010-02-06 14:28:36 -0600 (Sat, 06 Feb 2010) | 1 line Issue #7857: Gave server thread more time to get ready, and re-enabled a skipped test. ........ r78032 | georg.brandl | 2010-02-06 15:54:40 -0600 (Sat, 06 Feb 2010) | 1 line Remove unused imports from test_logging. ........ r78033 | benjamin.peterson | 2010-02-06 16:08:15 -0600 (Sat, 06 Feb 2010) | 1 line make waiting for the server to start robust ........ r78081 | vinay.sajip | 2010-02-07 06:56:54 -0600 (Sun, 07 Feb 2010) | 1 line Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code. ........ r78085 | vinay.sajip | 2010-02-07 07:06:51 -0600 (Sun, 07 Feb 2010) | 1 line logging: Removed some more 1.5.2 support code. ........ r78103 | vinay.sajip | 2010-02-08 00:50:14 -0600 (Mon, 08 Feb 2010) | 1 line Removed spurious print statement in test. ........ r78105 | vinay.sajip | 2010-02-08 09:32:08 -0600 (Mon, 08 Feb 2010) | 1 line logging: skipped listening tests because they're not working reliably. ........ r78106 | vinay.sajip | 2010-02-08 10:05:50 -0600 (Mon, 08 Feb 2010) | 1 line Issue #7857: Another attempt to keep the buildbots happy. ........ r78108 | vinay.sajip | 2010-02-08 15:18:15 -0600 (Mon, 08 Feb 2010) | 1 line logging: gingerly re-enabling skipped tests after improving thread sync code in configurator. ........ r78246 | vinay.sajip | 2010-02-19 17:53:17 -0600 (Fri, 19 Feb 2010) | 1 line logging: Documented warnings module integration. ........ r78703 | vinay.sajip | 2010-03-05 16:11:24 -0600 (Fri, 05 Mar 2010) | 1 line Factored out time usage determination into a method, to facilitate alternative formatting implementations in the future. ........ r78728 | vinay.sajip | 2010-03-06 09:12:08 -0600 (Sat, 06 Mar 2010) | 1 line Added schema version test in dictConfig. ........ r78731 | vinay.sajip | 2010-03-06 09:56:03 -0600 (Sat, 06 Mar 2010) | 1 line Added checks for tuples in dictConfig. ........ r78853 | vinay.sajip | 2010-03-12 00:01:21 -0600 (Fri, 12 Mar 2010) | 1 line Issue #8117: logging: Improved algorithm for computing initial rollover time. ........ r78855 | vinay.sajip | 2010-03-12 03:16:10 -0600 (Fri, 12 Mar 2010) | 1 line Issue #8117: Updated NEWS entry and added to logging documentation. ........		2010-03-13 22:30:34 +00:00
..
ctypes	Merged revisions 78544 via svnmerge from	2010-03-01 04:59:27 +00:00
curses	Merged revisions 64623,64640,64665,64687,64689-64690,64719,64721,64735,64742,64744-64746,64756-64761,64767-64769,64771-64772,64774-64775,64788,64793,64835-64836 via svnmerge from	2008-07-16 03:43:04 +00:00
dbm	Redundancy isn't needed here.	2009-10-10 21:28:29 +00:00
distutils	Merged revisions 78678,78680,78682 via svnmerge from	2010-03-05 03:33:11 +00:00
email	bdecode was already gone in email 5. This merge adds the test from	2010-03-08 02:17:03 +00:00
encodings	Merged revisions 78806 via svnmerge from	2010-03-08 22:17:58 +00:00
html	#2834: Change re module semantics, so that str and bytes mixing is forbidden,	2008-08-19 17:56:33 +00:00
http	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
idlelib	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
importlib	Importlib was not matching import's handling of .pyc files where it had less	2010-02-19 16:01:06 +00:00
json	Merged revisions 76708 via svnmerge from	2009-12-08 15:57:31 +00:00
lib2to3	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
logging	Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from	2010-03-13 22:30:34 +00:00
msilib	Merged revisions 73390 via svnmerge from	2009-06-12 17:31:41 +00:00
multiprocessing	Merged revisions 78777,78787,78790 via svnmerge from	2010-03-08 13:32:17 +00:00
plat-aix4	…
plat-darwin	These are present in the trunk but no longer in 3.x, which causes problems	2009-03-04 23:21:07 +00:00
plat-freebsd4	Merged revisions 78644 via svnmerge from	2010-03-04 02:11:41 +00:00
plat-freebsd5	Merged revisions 78644 via svnmerge from	2010-03-04 02:11:41 +00:00
plat-freebsd6	Merged revisions 78644 via svnmerge from	2010-03-04 02:11:41 +00:00
plat-freebsd7	Merged revisions 78644 via svnmerge from	2010-03-04 02:11:41 +00:00
plat-freebsd8	Merged revisions 78644 via svnmerge from	2010-03-04 02:11:41 +00:00
plat-generic	…
plat-linux2	Rip out 'long' and 'L'-suffixed integer literals.	2007-01-15 16:59:06 +00:00
plat-netbsd1	Whitespace normalization, via reindent.py.	2004-07-18 06:16:08 +00:00
plat-next3	Do no regenerate modules that should no longer be here.	2001-05-10 15:52:47 +00:00
plat-os2emx	Merged revisions 78644 via svnmerge from	2010-03-04 02:11:41 +00:00
plat-sunos5	Merged revisions 78678,78680,78682 via svnmerge from	2010-03-05 03:33:11 +00:00
plat-unixware7	Merged revisions 55817-55961 via svnmerge from	2007-06-13 18:07:49 +00:00
pydoc_data	update pydoc-topics	2009-06-26 13:05:03 +00:00
site-packages	Add a README file so that cvs update -P doesn't obliterate this	2000-03-31 20:03:56 +00:00
sqlite3	Merged revisions 78898 via svnmerge from	2010-03-13 03:28:34 +00:00
test	Merged revisions 77967,77969,77973,77979,77985-77986,78009,78029,78031-78033,78081,78085,78103,78105-78106,78108,78246,78703,78728,78731,78853,78855 via svnmerge from	2010-03-13 22:30:34 +00:00
tkinter	Merged revisions 74507-74511,74517 via svnmerge from	2009-08-18 15:35:57 +00:00
unittest	Merged revisions 78158 via svnmerge from	2010-02-11 14:16:38 +00:00
urllib	Reverting the changes made in r78433.	2010-03-07 04:12:02 +00:00
wsgiref	Manually copy patch for bug 7250 from the release26-maint branch. I suck	2010-03-01 21:53:00 +00:00
xml	Merged revisions 78125 via svnmerge from	2010-02-09 17:25:47 +00:00
xmlrpc	Merged revisions 74558 via svnmerge from	2009-12-16 10:50:44 +00:00
__future__.py	barry has already been causing test breakage	2009-04-01 20:38:13 +00:00
__phello__.foo.py	…
_abcoll.py	Issue 6037: MutableSequence.__iadd__ should return self.	2009-05-18 15:35:26 +00:00
_compat_pickle.py	Issue #6137: The pickle module now translates module names when loading	2009-06-04 20:32:06 +00:00
_dummy_thread.py	Merged revisions 65787 via svnmerge from	2008-08-17 22:31:15 +00:00
_markupbase.py	…
_pyio.py	Only the parts which are relevant for 3.x branch.	2010-03-13 15:26:44 +00:00
_strptime.py	The message for the exception when time.strptime was passed something other	2009-03-31 03:58:04 +00:00
_threading_local.py	fixes issue #1522237, bad init check in _threading_local	2010-02-22 19:55:46 +00:00
_weakrefset.py	Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against	2010-01-08 17:54:23 +00:00
abc.py	Merged revisions 77789 via svnmerge from	2010-01-27 02:25:58 +00:00
aifc.py	Merged revisions 72425-72426 via svnmerge from	2009-05-07 18:24:38 +00:00
antigravity.py	Another hidden treasure.	2009-06-03 17:21:17 +00:00
argparse.py	Merged revisions 78600-78601 via svnmerge from	2010-03-02 23:09:38 +00:00
ast.py	Merged revisions 68450,68480-68481,68493,68495,68501,68512,68514-68515,68534-68536,68552,68563,68570-68572,68575,68582,68596,68623-68624,68628 via svnmerge from	2009-01-16 03:54:08 +00:00
asynchat.py	Fixed bugs 760475, 953599, and 1519. This is a translation of changelist 64768	2008-07-07 05:04:12 +00:00
asyncore.py	This fixes bug 5798 on OS X.	2009-06-03 19:48:02 +00:00
base64.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
bdb.py	Merged revisions 72322 via svnmerge from	2009-05-05 09:00:19 +00:00
binhex.py	Issues #2715, #6621: Remove unused and undefined references to FSSpec	2009-08-02 20:08:54 +00:00
bisect.py	Per the language summit, the optional fastpath imports should use from-import-star.	2009-03-31 17:51:51 +00:00
build_class.py	…
cProfile.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
calendar.py	…
cgi.py	Merged revisions 78844 via svnmerge from	2010-03-11 22:05:58 +00:00
cgitb.py	Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from	2009-04-11 19:48:14 +00:00
chunk.py	…
cmd.py	Merged revisions 77185-77188,77262,77313,77317,77331-77333,77337-77338 via svnmerge from	2010-01-09 18:53:06 +00:00
code.py	Merged revisions 75264,75268,75293,75318,75391-75392,75436,75478,75971,76003,76058,76140-76141,76231,76380,76428-76429 via svnmerge from	2009-11-25 17:46:26 +00:00
codecs.py	…
codeop.py	correct porting error with raise #7161	2009-10-18 00:32:49 +00:00
collections.py	Merged revisions 77241 via svnmerge from	2010-01-02 21:40:36 +00:00
colorsys.py	Merged revisions 68884,68973,68978,69003,69083,69112-69113 via svnmerge from	2009-01-30 03:39:35 +00:00
compileall.py	Merged revisions 71750 via svnmerge from	2009-04-19 17:14:11 +00:00
configparser.py	Merged revisions 78232 via svnmerge from	2010-02-19 06:08:41 +00:00
contextlib.py	remove nested from __all__	2009-07-01 01:38:23 +00:00
copy.py	Merged revisions 76571 via svnmerge from	2009-11-28 15:58:27 +00:00
copyreg.py	…
csv.py	Merged revisions 78384 via svnmerge from	2010-02-23 22:57:58 +00:00
decimal.py	Merged revisions 78217-78218 via svnmerge from	2010-02-18 14:49:50 +00:00
difflib.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
dis.py	Merged revisions 68116-68119,68121,68123-68127 via svnmerge from	2009-01-01 15:05:06 +00:00
doctest.py	For 3.x, the "backslashreplace" error handling is plugged on the "write" method.	2010-02-27 14:21:57 +00:00
dummy_threading.py	…
filecmp.py	Use new form of with-statement instead of contextlib.nested().	2009-06-04 00:11:54 +00:00
fileinput.py	Use PEP 8 and true booleans.	2009-05-17 12:22:57 +00:00
fnmatch.py	Merged revisions 74475 via svnmerge from	2009-08-16 18:58:46 +00:00
formatter.py	Fix formatter usage of filter(). Bug #3800.	2008-09-09 19:31:25 +00:00
fractions.py	Merged revisions 76456 via svnmerge from	2009-11-23 16:27:17 +00:00
ftplib.py	Merged revisions 76546 via svnmerge from	2009-11-27 13:23:26 +00:00
functools.py	…
genericpath.py	Issue #3187: Better support for "undecodable" filenames. Code by Victor	2008-10-02 18:55:37 +00:00
getopt.py	Merged revisions 67463,67572,67576,67628 via svnmerge from	2008-12-07 15:15:22 +00:00
getpass.py	Merged revisions 76000,76016 via svnmerge from	2009-11-01 18:42:17 +00:00
gettext.py	Merged revisions 72506,72525-72526,72551,72558,72616,72654-72655,72689,72745,72750,72802,72812,72822,72824,72826-72827,72833,72876,72890,72923,72946,73026,73042,73045,73047,73065,73068-73069 via svnmerge from	2009-06-01 22:42:33 +00:00
glob.py	Merged revisions 70712,70714,70764-70765,70769-70771,70773,70776-70777,70788-70789,70824,70828,70832,70836,70842,70851,70855,70857,70866-70872,70883,70885,70893-70894,70896-70897,70903,70905-70907,70915,70927,70933,70951,70960,70962-70964,70998,71001,71006,71008,71010-71011,71019,71037,71056,71094,71101-71103,71106,71119,71123,71149-71150,71203,71212,71214-71217,71221,71240 via svnmerge from	2009-04-05 19:13:16 +00:00
gzip.py	Merged revisions 77472-77473 via svnmerge from	2010-01-13 14:37:26 +00:00
hashlib.py	Merged revisions 78528 via svnmerge from	2010-03-01 02:05:26 +00:00
heapq.py	Make life easier for non-CPython implementations	2009-03-29 19:30:50 +00:00
hmac.py	…
imaplib.py	Merged revisions 77041 via svnmerge from	2009-12-24 16:12:49 +00:00
imghdr.py	Merged revisions 65713 via svnmerge from	2008-08-16 16:48:16 +00:00
inspect.py	Merged revisions 75149,75260-75263,75265-75267,75292,75300,75376,75405,75429-75433,75437,75445,75501,75551,75572,75589-75591,75657,75742,75868,75952-75957,76057,76105,76139,76143,76162,76223 via svnmerge from	2009-11-13 02:25:08 +00:00
io.py	add myself	2009-05-01 20:45:43 +00:00
keyword.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
linecache.py	Merged revisions 72319-72320 via svnmerge from	2009-05-05 08:31:54 +00:00
locale.py	Issue #7080: locale.strxfrm() raises a MemoryError on 64-bit non-Windows	2009-10-19 19:43:09 +00:00
macpath.py	Fix macpath to deal with bytes	2010-03-08 12:25:35 +00:00
macurl2path.py	Fixing Issue6711 - macurl2path has typos that raise AttributeError	2009-08-16 06:43:50 +00:00
mailbox.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
mailcap.py	…
mimetypes.py	Merged revisions 76306 via svnmerge from	2009-11-15 14:25:16 +00:00
modulefinder.py	no 2.3 compat in the py3k lib #3676	2009-02-16 16:20:10 +00:00
netrc.py	…
nntplib.py	Merged revisions 72640 via svnmerge from	2009-05-14 21:30:46 +00:00
ntpath.py	Fix ntpath abspath to deal with bytes.	2010-03-08 14:44:41 +00:00
nturl2path.py	Fix for issue1153027, making Py3k changes similar to fix in issue918368.	2009-05-05 18:41:13 +00:00
numbers.py	Issue 4998: restore utility of __slots__ on Fraction.	2009-02-12 17:58:36 +00:00
opcode.py	Merged revisions 72912,72920,72940 via svnmerge from	2009-06-28 03:18:59 +00:00
optparse.py	Merged revisions 71540,71563 via svnmerge from	2009-04-27 16:41:41 +00:00
os.py	Add an os.get_exec_path() function to return the list of directories	2010-02-27 07:22:22 +00:00
os2emxpath.py	…
pdb.doc	…
pdb.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
pickle.py	Simplified long coding in pickle.py.	2010-01-12 01:49:31 +00:00
pickletools.py	Issue #6137: The pickle module now translates module names when loading	2009-06-04 20:32:06 +00:00
pipes.py	…
pkgutil.py	Issue 4005: Remove .sort() call on dict_keys object.	2009-07-05 06:42:44 +00:00
platform.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
plistlib.py	updated the doc to match the module docstring, fixed a couple of errors in the doc markup and in the module	2009-09-16 00:49:03 +00:00
poplib.py	Issue #6622: Fix 'variable referenced before assignment' bug in POP3.apop.	2009-08-06 16:06:25 +00:00
posixpath.py	Merged revisions 70980,71059,71225,71234,71241,71243,71249,71251,71255,71266,71299,71329,71397-71398,71486 via svnmerge from	2009-04-11 19:48:14 +00:00
pprint.py	Issue 3976: fix pprint for sets, frozensets, and dicts containing unorderable types.	2009-11-19 01:07:05 +00:00
profile.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
pstats.py	Use true kwonly arg instead of **kwds hackaround.	2009-09-02 20:33:30 +00:00
pty.py	Issue #3782: os.write() must not accept unicode strings	2008-09-15 23:02:56 +00:00
py_compile.py	#2834: Change re module semantics, so that str and bytes mixing is forbidden,	2008-08-19 17:56:33 +00:00
pyclbr.py	…
pydoc.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
queue.py	port the queue change r70405	2009-03-21 17:36:10 +00:00
quopri.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
random.py	Issue #7435: Remove duplicate int/long tests, and other	2009-12-05 20:28:34 +00:00
re.py	Merged revisions 70090 via svnmerge from	2009-03-02 05:21:55 +00:00
reprlib.py	…
rlcompleter.py	Merged revisions 65168 via svnmerge from	2008-07-21 16:32:10 +00:00
runpy.py	Merged revisions 76934-76935 via svnmerge from	2009-12-20 17:28:31 +00:00
sched.py	Merged revisions 72932 via svnmerge from	2009-05-26 07:51:03 +00:00
shelve.py	Merged revisions 78141-78142 via svnmerge from	2010-02-11 02:42:19 +00:00
shlex.py	…
shutil.py	Merged revisions 78364 via svnmerge from	2010-02-23 05:39:18 +00:00
site.py	Merged revisions 78826 via svnmerge from	2010-03-12 14:45:56 +00:00
smtpd.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
smtplib.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
sndhdr.py	…
socket.py	Merged revisions 74426 via svnmerge from	2010-01-04 04:50:36 +00:00
socketserver.py	http://bugs.python.org/issue6382	2009-07-07 09:09:10 +00:00
sre_compile.py	Merged revisions 66894 via svnmerge from	2008-10-14 23:07:40 +00:00
sre_constants.py	#2834: Change re module semantics, so that str and bytes mixing is forbidden,	2008-08-19 17:56:33 +00:00
sre_parse.py	#6509: fix re.sub to work properly when the pattern, the string, and the replacement were all bytes. Patch by Antoine Pitrou.	2010-03-06 15:24:08 +00:00
ssl.py	Merged revisions 77595 via svnmerge from	2010-01-18 09:15:14 +00:00
stat.py	…
string.py	Merged revisions 75070 via svnmerge from	2009-09-26 12:33:22 +00:00
stringprep.py	…
struct.py	Merged revisions 75283 via svnmerge from	2009-10-08 15:59:20 +00:00
subprocess.py	Merged revisions 78736,78759,78761,78767,78788-78789 via svnmerge from	2010-03-08 13:27:26 +00:00
sunau.py	#3567: fix sunau for running with -bb and make test_ossaudiodev work.	2008-08-17 00:38:32 +00:00
symbol.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
symtable.py	simplify this expression	2009-06-28 19:30:36 +00:00
sysconfig.py	Merged revisions 78835-78837 via svnmerge from	2010-03-12 14:20:59 +00:00
tabnanny.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
tarfile.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
telnetlib.py	- fix issue #6106, Telnet.process_rawq default handling of WILL/WONT/DO/DONT	2009-07-26 22:23:04 +00:00
tempfile.py	#6077: on Windows, fix truncation of a tempfile.TemporaryFile opened in "wt+" mode:	2009-11-30 00:08:56 +00:00
textwrap.py	Merged revisions 74779-74786,74793,74795,74811,74860-74861,74863,74876,74886,74896,74901,74903,74908,74912,74930,74933,74943,74946,74952-74955,75015,75019,75032,75068,75076,75095,75098,75102,75129,75139,75230 via svnmerge from	2009-10-04 14:49:41 +00:00
this.py	…
threading.py	Merged revisions 78517 via svnmerge from	2010-02-28 18:57:46 +00:00
timeit.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
token.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
tokenize.py	use some more itertools magic to make '' be yielded after readline is done	2009-11-14 18:09:17 +00:00
trace.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
traceback.py	Issue #4486: When an exception has an explicit cause, do not print its implicit context too.	2009-11-28 16:12:28 +00:00
tty.py	…
turtle.py	Merged revisions 77209,77229,77359-77360,77371 via svnmerge from	2010-01-09 18:45:30 +00:00
types.py	…
uu.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
uuid.py	#7380: Fix some str/bytearray/bytes issues in uuid docs and implementation.	2009-12-19 18:23:28 +00:00
warnings.py	Merged revisions 75365,75394,75402-75403,75418,75459,75484,75592-75596,75600,75602-75607,75610-75613,75616-75617,75623,75627,75640,75647,75696,75795 via svnmerge from	2009-10-27 15:28:25 +00:00
wave.py	use floor division where needed #7681	2010-01-13 03:49:50 +00:00
weakref.py	Issue #7105: Make WeakKeyDictionary and WeakValueDictionary robust against	2010-01-08 17:54:23 +00:00
webbrowser.py	convert shebang lines: python -> python3	2010-03-11 22:53:45 +00:00
wsgiref.egg-info	…
xdrlib.py	…
zipfile.py	Merged revisions 78097 via svnmerge from	2010-02-07 20:24:02 +00:00