Benjamin Peterson 1e94021ea5 merge heads		2011-05-26 09:57:21 -05:00
..
bsddb	Merged revisions 86596 via svnmerge from	2010-11-21 13:34:58 +00:00
compiler	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
ctypes	check possible recursive _as_parameter_ to prevent segfault (closes #1838)	2011-03-26 17:56:28 -05:00
curses	Issue #5622: Fix curses.wrapper to raise correct exception if curses	2011-03-09 02:31:55 -08:00
distutils	Branch merge	2011-05-25 18:06:35 +02:00
email	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
encodings	Merged revisions 83198 via svnmerge from	2010-07-28 01:55:43 +00:00
hotshot	Fix deprecation warnings in test_hotshot.py	2010-08-03 07:03:40 +00:00
idlelib	IDLE: #6378: Further adjust idle.bat to start associated Python	2011-05-25 22:36:51 -04:00
importlib	Fix some more bugs caused by the backport from 3.x for importlib.	2009-03-04 01:00:53 +00:00
json	#5723: Improve json tests to be executed with and without accelerations.	2011-05-14 06:24:53 +03:00
lib-tk	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
lib2to3	revert unintended changes	2011-03-26 18:11:54 -05:00
logging	Reverted bug fixes for #11444 (fc4d045e3170) and #11424 (b9d76846bb1c), which should not have been made in this branch.	2011-03-11 18:44:10 +00:00
msilib	Closes #11696: Fix ID generation in msilib.	2011-03-27 20:58:52 +02:00
multiprocessing	Fix #5162. Allow child spawning from Windows services (via pywin32).	2011-04-11 18:00:59 -05:00
plat-aix3	…
plat-aix4	…
plat-atheos	set svn:executable on all regen scripts	2010-03-04 02:07:55 +00:00
plat-beos5	…
plat-darwin	…
plat-freebsd4	set svn:executable on all regen scripts	2010-03-04 02:07:55 +00:00
plat-freebsd5	set svn:executable on all regen scripts	2010-03-04 02:07:55 +00:00
plat-freebsd6	set svn:executable on all regen scripts	2010-03-04 02:07:55 +00:00
plat-freebsd7	set svn:executable on all regen scripts	2010-03-04 02:07:55 +00:00
plat-freebsd8	set svn:executable on all regen scripts	2010-03-04 02:07:55 +00:00
plat-generic	…
plat-irix5	remove executable property from doc files	2010-03-11 21:50:45 +00:00
plat-irix6	Merged revisions 77593,77702-77703,77858,77887,78113-78115,78117,78245,78385-78386,78496,78760,78771-78773,78802 via svnmerge from	2010-03-21 19:29:04 +00:00
plat-linux2	…
plat-mac	In a number of places code still revers	2010-05-05 19:09:31 +00:00
plat-netbsd1	…
plat-next3	…
plat-os2emx	set svn:executable on all regen scripts	2010-03-04 02:07:55 +00:00
plat-riscos	Patch #2167 from calvin: Remove unused imports	2008-02-23 17:40:11 +00:00
plat-sunos5	remove the svn:executable property from files that don't have shebang lines	2010-03-05 03:20:06 +00:00
plat-unixware7	…
pydoc_data	update pydoc-topics	2010-07-03 13:53:45 +00:00
site-packages	…
sqlite3	Merged revisions 86596 via svnmerge from	2010-11-21 13:34:58 +00:00
test	raise an ValueError in getvalue() on closed StringIO (closes #12161)	2011-05-26 09:56:41 -05:00
unittest	Fix deprecation warnings in test_unittest.	2011-05-09 05:58:17 +03:00
wsgiref	Merged revisions 87797 via svnmerge from	2011-01-06 17:19:05 +00:00
xml	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
BaseHTTPServer.py	Merged revisions 87317 via svnmerge from	2010-12-16 17:11:34 +00:00
Bastion.py	Deprecate Bastion and rexec for 3.0.	2008-05-10 02:27:04 +00:00
CGIHTTPServer.py	Merged revisions 86195 via svnmerge from	2010-11-05 15:12:47 +00:00
ConfigParser.py	Issue 11089: Fix performance bug in ConfigParser that impaired its	2011-02-02 08:37:11 +00:00
Cookie.py	Merged revisions 87550 via svnmerge from	2010-12-28 19:11:03 +00:00
DocXMLRPCServer.py	http://bugs.python.org/issue6267	2009-06-28 21:04:17 +00:00
HTMLParser.py	Fix display of html.parser.HTMLParser.feed docstrin	2011-05-25 18:11:43 +02:00
MimeWriter.py	…
Queue.py	Move the previously local import of threading to module level.	2009-03-15 22:11:07 +00:00
SimpleHTTPServer.py	merge from 2.5 branch.	2011-03-17 14:23:24 +08:00
SimpleXMLRPCServer.py	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
SocketServer.py	#11515: fix several typos. Patch by Piotr Kasprzyk.	2011-03-15 18:55:01 +02:00
StringIO.py	raise an ValueError in getvalue() on closed StringIO (closes #12161)	2011-05-26 09:56:41 -05:00
UserDict.py	keep UserDict an old-style class	2010-06-22 18:09:02 +00:00
UserList.py	Issue 2235: Py3k warnings are now emitted for classes that will no longer inherit a__hash__ implementation from a parent class in Python 3.x. The standard library and test suite have been updated to not emit these warnings.	2008-08-11 15:45:58 +00:00
UserString.py	Issue 2235: __hash__ is once again inherited by default, but inheritance can be blocked explicitly so that collections.Hashable remains meaningful	2008-07-15 14:27:37 +00:00
_LWPCookieJar.py	…
_MozillaCookieJar.py	Merged revisions 83392,83426 via svnmerge from	2010-08-01 22:05:31 +00:00
__future__.py	Patch #2477: Added from __future__ import unicode_literals	2008-03-26 22:01:37 +00:00
__phello__.foo.py	…
_abcoll.py	Merged revisions 86857 via svnmerge from	2010-11-30 01:18:17 +00:00
_pyio.py	Issue #12175: RawIOBase.readall() now returns None if read() returns None.	2011-05-25 22:52:37 +02:00
_strptime.py	add %f format to datetime - issue 1158	2008-03-15 16:04:45 +00:00
_threading_local.py	Merged revisions 84344 via svnmerge from	2010-08-28 18:29:13 +00:00
_weakrefset.py	Merged revisions 86881,86887,86913-86915,86933,86943,86960,86964,86974,86980,86996,87008 via svnmerge from	2011-02-25 10:39:23 +00:00
abc.py	Use weakrefs to hold onto classes #2521.	2010-08-21 03:03:22 +00:00
aifc.py	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
antigravity.py	easter egg	2008-10-15 11:49:10 +00:00
anydbm.py	Add docstring to anydbm.open	2011-05-01 02:02:30 +02:00
argparse.py	Issue #9347: Fix formatting for tuples in argparse type= error messages.	2011-04-04 01:47:52 +02:00
ast.py	Issue #11000 ast.parse doc fix (r88172)	2011-01-24 21:48:11 +00:00
asynchat.py	warnings.catch_warnings() now returns a list or None instead of the custom	2008-09-09 00:49:16 +00:00
asyncore.py	Merged revisions 88722 via svnmerge from	2011-03-03 14:17:51 +00:00
atexit.py	…
audiodev.py	Deprecate the audiodev module for 3.0.	2008-05-06 23:23:34 +00:00
base64.py	Merged revisions 85497 via svnmerge from	2010-10-14 21:22:52 +00:00
bdb.py	Merged revisions 86861 via svnmerge from	2010-11-29 12:41:03 +00:00
binhex.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
bisect.py	Per the language summit, the optional fastpath imports should use from-import-star.	2009-03-31 17:47:06 +00:00
cProfile.py	Merged revisions 83524,84776 via svnmerge from	2010-09-13 17:36:36 +00:00
calendar.py	Merged revisions 85728 via svnmerge from	2010-11-26 07:57:57 +00:00
cgi.py	Merged revisions 83901 via svnmerge from	2010-08-09 20:18:04 +00:00
cgitb.py	Merged revisions 79558 via svnmerge from	2010-08-02 20:26:41 +00:00
chunk.py	…
cmd.py	Merged revisions 83381 via svnmerge from	2010-08-01 04:11:05 +00:00
code.py	this main is much more useful	2009-11-12 23:42:23 +00:00
codecs.py	Merged revisions 81471-81472 via svnmerge from	2010-05-22 16:52:13 +00:00
codeop.py	…
collections.py	Other minor clean-ups.	2011-04-24 12:55:28 -07:00
colorsys.py	pep8tify conditionals	2009-01-30 02:02:25 +00:00
commands.py	Merged revisions 72458 via svnmerge from	2009-05-08 02:47:02 +00:00
compileall.py	Add doc for compileall.compile_file	2010-12-16 06:15:02 +00:00
contextlib.py	Remove markup from docstring	2009-06-23 10:51:02 +00:00
cookielib.py	Merged revisions 83145 via svnmerge from	2010-07-25 20:00:02 +00:00
copy.py	Merged revisions 84495-84496 via svnmerge from	2010-09-04 17:52:26 +00:00
copy_reg.py	Revert copy_reg -> copyreg rename.	2008-05-20 07:49:57 +00:00
csv.py	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
dbhash.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
decimal.py	Neaten-up the fix to issue 11830	2011-04-12 09:06:01 -07:00
difflib.py	Issue 11747: Fix output format for context diffs.	2011-04-12 15:48:25 -07:00
dircache.py	Deprecate the dircache module for 3.0.	2008-05-10 21:12:57 +00:00
dis.py	Merged revisions 79769 via svnmerge from	2010-04-04 23:27:35 +00:00
doctest.py	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
dumbdbm.py	…
dummy_thread.py	Remove imports of 'warnings' that are no longer needed in dummy_thread,	2008-08-17 22:10:11 +00:00
dummy_threading.py	…
filecmp.py	use multi-with syntax	2009-06-11 17:51:17 +00:00
fileinput.py	Remove a use of callable() in fileinput to silence a -3 warning.	2008-08-03 23:52:32 +00:00
fnmatch.py	Merged revisions 82769 via svnmerge from	2010-07-10 14:11:51 +00:00
formatter.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
fpformat.py	Deprecate the fpformat module for removal in 3.0.	2008-05-10 22:11:45 +00:00
fractions.py	Issue #8294: Allow float and Decimal arguments in Fraction constructor.	2010-04-02 22:27:36 +00:00
ftplib.py	#11515: fix several typos. Patch by Piotr Kasprzyk.	2011-03-15 18:55:01 +02:00
functools.py	Issue #11628: cmp_to_key should use__slots__.	2011-03-22 13:20:59 -07:00
genericpath.py	No need to assign the results of expressions used only for side effects.	2010-02-06 22:59:15 +00:00
getopt.py	Merged revisions 83117 via svnmerge from	2010-07-24 01:12:54 +00:00
getpass.py	issue11236 getpass.getpass to respond ctrl-c or ctrl-z	2011-04-26 21:02:26 +08:00
gettext.py	#11515: fix several typos. Patch by Piotr Kasprzyk.	2011-03-15 18:55:01 +02:00
glob.py	Merged revisions 70866-70868,70870-70871,70893,70896,70902,70905,70907,70912,70915,70927,70933,70940,70944,70954,70963,70998,71056 via svnmerge from	2009-04-05 21:21:05 +00:00
gzip.py	Merged revisions 85291 via svnmerge from	2010-10-06 21:26:52 +00:00
hashlib.py	Fixes Issue #12059: Properly handle missing hash functions even when	2011-05-14 15:07:53 -07:00
heapq.py	Minor tweaks to a few comments in heapq	2011-04-15 23:34:31 +02:00
hmac.py	silence callable warning in hmac	2008-08-19 19:07:38 +00:00
htmlentitydefs.py	revert creation of the html.entities and html.parser modules	2008-05-20 06:08:38 +00:00
htmllib.py	Deprecate htmllib and sgmllib for 3.0.	2008-06-01 21:19:14 +00:00
httplib.py	#11515: fix several typos. Patch by Piotr Kasprzyk.	2011-03-15 18:55:01 +02:00
ihooks.py	Add support to the ihooks module for relative imports.	2009-10-14 19:23:53 +00:00
imaplib.py	Issue #1441530: In imaplib, use makefile() to wrap the SSL socket to avoid	2011-05-24 23:10:54 +02:00
imghdr.py	#3424 rearrange the order of tests in imghdr to place more common types first	2008-08-16 16:29:02 +00:00
imputil.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
inspect.py	Correct handling of functions with only kwarg args in getcallargs (closes #11256)	2011-03-28 17:32:31 -05:00
io.py	Merged revisions 78757 via svnmerge from	2010-08-02 21:35:06 +00:00
keyword.py	#1726198: replace while 1: fp.readline() with file iteration.	2008-01-21 17:22:06 +00:00
linecache.py	Merged revisions 81432 via svnmerge from	2010-05-21 21:45:16 +00:00
locale.py	(backport)Fix #10154 and #10090: locale normalizes the UTF-8 encoding to "UTF-8" instead of "UTF8"	2011-05-17 13:22:30 +02:00
macpath.py	Merged revisions 84701,84784 via svnmerge from	2010-09-13 20:31:34 +00:00
macurl2path.py	…
mailbox.py	#11999: sync based on comparing mtimes, not mtime to system clock	2011-05-06 21:56:22 -04:00
mailcap.py	…
markupbase.py	…
md5.py	…
mhlib.py	Deprecated the mhlib module for removal in 3.0.	2008-05-11 03:01:47 +00:00
mimetools.py	warnings.catch_warnings() now returns a list or None instead of the custom	2008-09-09 00:49:16 +00:00
mimetypes.py	Merged revisions 85774 via svnmerge from	2010-10-21 14:48:22 +00:00
mimify.py	…
modulefinder.py	Merged revisions 67046 via svnmerge from	2008-10-30 20:29:54 +00:00
multifile.py	Deprecate the multifile module as per PEP 4.	2008-05-12 03:19:20 +00:00
mutex.py	use True and False	2009-01-27 23:15:48 +00:00
netrc.py	Merged revisions 86925 via svnmerge from	2010-12-02 03:16:23 +00:00
new.py	restricted environments are no more	2009-08-28 16:48:03 +00:00
nntplib.py	#11515: fix several typos. Patch by Piotr Kasprzyk.	2011-03-15 18:55:01 +02:00
ntpath.py	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
nturl2path.py	Fix Issue11474 - url2pathname() handling of '/C|/' on Windows	2011-04-14 12:54:35 +08:00
numbers.py	Merged revisions 87455 via svnmerge from	2010-12-23 22:22:48 +00:00
opcode.py	Issue #2333: Backport set and dict comprehensions syntax.	2010-01-11 22:36:12 +00:00
optparse.py	#8158: add missing 'description' description to optparse docstring.	2011-05-04 21:05:52 -04:00
os.py	Merged revisions 77879 via svnmerge from	2010-01-31 16:47:55 +00:00
os2emxpath.py	Merged revisions 78247 via svnmerge from	2010-02-20 09:16:04 +00:00
pdb.doc	Untabify.	2010-06-27 11:24:15 +00:00
pdb.py	Merged revisions 83429,83436 via svnmerge from	2010-08-01 22:10:15 +00:00
pickle.py	Isue #5084: unpickling now interns the attribute names of pickled objects,	2009-05-02 21:13:23 +00:00
pickletools.py	#11565: Fix several typos. Patch by Piotr Kasprzyk.	2011-03-16 12:34:31 +02:00
pipes.py	Merged revisions 79822,79828,79862,80067,80069,80080-80081,80084,80432-80433 via svnmerge from	2010-05-18 23:19:34 +00:00
pkgutil.py	Add missing name in pkgutil.__all__	2011-05-25 18:11:24 +02:00
platform.py	#11985: update docstring of platform.python_implementation.	2011-05-04 18:37:50 +03:00
plistlib.py	Fix for issue 7852: the DTD for OSX Plists has changed due	2010-04-20 20:59:37 +00:00
popen2.py	Use os.closerange() in popen2.	2008-02-23 22:09:24 +00:00
poplib.py	Fixed the semantic of timeout for socket.create_connection and	2008-05-29 16:39:26 +00:00
posixfile.py	…
posixpath.py	Issue #5117: Fixed root directory related issue on posixpath.relpath() and	2010-10-18 13:55:29 +00:00
pprint.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
profile.py	Merged revisions 83524,84776 via svnmerge from	2010-09-13 17:36:36 +00:00
pstats.py	Merged revisions 86580 via svnmerge from	2010-11-20 17:09:14 +00:00
pty.py	…
py_compile.py	fix typo in r79533, introduced by the fix for issue #8233	2010-04-20 19:45:34 +00:00
pyclbr.py	Minor cleanups:	2008-04-28 02:57:23 +00:00
pydoc.py	Close #12182: Fix pydoc.HTMLDoc.multicolumn() if Python uses the new (true)	2011-05-26 13:37:25 +02:00
quopri.py	…
random.py	Minor code cleanup.	2011-05-18 17:28:50 -05:00
re.py	#2650: Refactor re.escape and its tests.	2011-03-25 14:50:52 +02:00
repr.py	Revert the renaming of repr to reprlib.	2008-05-23 05:03:59 +00:00
rexec.py	No need to assign the results of expressions used only for side effects.	2010-02-06 22:59:15 +00:00
rfc822.py	fix test_py3kwarns	2008-07-14 17:42:17 +00:00
rlcompleter.py	Remove a use of callable() to silence the warning triggered under -3.	2008-08-01 01:45:49 +00:00
robotparser.py	Merged revisions 83449 via svnmerge from	2010-08-01 22:00:39 +00:00
runpy.py	Merged revisions 85398 via svnmerge from	2010-10-13 01:10:16 +00:00
sched.py	Merged revisions 72932 via svnmerge from	2009-05-26 07:50:52 +00:00
sets.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
sgmllib.py	Merged revisions 70906 via svnmerge from	2009-04-04 12:51:52 +00:00
sha.py	…
shelve.py	Merged revisions 78141-78142 via svnmerge from	2010-02-11 02:01:02 +00:00
shlex.py	…
shutil.py	Backport fix for issue #10684 from 3.x	2011-05-06 11:31:33 +02:00
site.py	Merged revisions 87497 via svnmerge from	2010-12-26 22:29:53 +00:00
smtpd.py	backporting security fix of issue 9129 (smtpd module vulnerable to DoS attacks in case of connection bashing)	2010-12-07 18:54:43 +00:00
smtplib.py	Issue #11927: SMTP_SSL now uses port 465 by default as documented. Patch by Kasun Herath.	2011-05-07 19:59:33 +02:00
sndhdr.py	Merged revisions 75407,75409-75413,75415,75419-75421 via svnmerge from	2010-08-03 03:19:00 +00:00
socket.py	Merged revisions 84597-84599 via svnmerge from	2010-09-07 21:40:25 +00:00
sre.py	…
sre_compile.py	remove set compat cruft	2008-10-14 22:37:18 +00:00
sre_constants.py	…
sre_parse.py	remove set compat cruft	2008-10-14 22:37:18 +00:00
ssl.py	(Merge 3.1) Issue #12012: ssl.PROTOCOL_SSLv2 becomes optional	2011-05-10 01:52:03 +02:00
stat.py	#2383: remove obsolete XXX comment in stat.py.	2008-03-20 07:25:55 +00:00
statvfs.py	Deprecated statvfs for removal in 3.0.	2008-05-16 00:50:02 +00:00
string.py	Merged revisions 84470-84471,84566-84567,84759 via svnmerge from	2010-09-13 07:46:37 +00:00
stringold.py	Replace all map(None, a) with list(a).	2008-07-18 19:06:13 +00:00
stringprep.py	…
struct.py	Merged revisions 75283 via svnmerge from	2009-10-27 17:00:03 +00:00
subprocess.py	whitespace fix	2011-04-29 16:28:52 -05:00
sunau.py	Merged revisions 77310-77311 via svnmerge from	2010-08-02 00:24:26 +00:00
sunaudio.py	Deprecate the sunaudio module for removal in Python 3.0. The sunau module can provide similar functionality.	2008-07-18 19:30:22 +00:00
symbol.py	regenerate symbol.py	2010-12-11 04:38:24 +00:00
symtable.py	return locals and cells in get_locals() not bound globals, though	2009-06-28 19:27:55 +00:00
sysconfig.py	Issue #9516: avoid errors in sysconfig when MACOSX_DEPLOYMENT_TARGET is set in shell.	2011-05-15 16:44:27 +02:00
tabnanny.py	…
tarfile.py	Fix closes issue #12088 - fixes the tarfile.extractall issue when the	2011-05-17 10:12:18 +08:00
telnetlib.py	Merged revisions 87230 via svnmerge from	2010-12-14 14:34:16 +00:00
tempfile.py	proxy the __exit__ call	2009-07-01 13:34:35 +00:00
textwrap.py	Optimize optimization and fix method name in docstring.	2009-09-18 16:19:56 +00:00
this.py	…
threading.py	backport fix from r87741 related to the issue6643 fix in r87727.	2011-01-04 18:43:54 +00:00
timeit.py	Merged revisions 83421,83424 via svnmerge from	2010-08-01 22:13:33 +00:00
toaiff.py	Deprecate the toaiff module for removal in 3.0.	2008-05-09 05:32:42 +00:00
token.py	Issue 2117. Update compiler module to handle class decorators.	2008-02-25 18:06:00 +00:00
tokenize.py	some cleanups	2009-10-15 03:05:39 +00:00
trace.py	Use floor division operator instead of deprecated division operator.	2011-04-11 17:45:01 -07:00
traceback.py	Merged revisions 80777 via svnmerge from	2010-05-05 12:45:31 +00:00
tty.py	…
types.py	remove more code for restricted execution	2009-08-28 16:49:56 +00:00
urllib.py	Merge issue 11662 from 2.6.	2011-03-29 12:53:55 -07:00
urllib2.py	Fix Issue11703 - urllib2.get_url does not handle fragment in url properly.	2011-04-13 07:31:45 +08:00
urlparse.py	Issue #11467: Fix urlparse behavior when handling urls which contains scheme	2011-04-15 18:07:33 +08:00
user.py	Deprecate the user module for removal in 3.0.	2008-05-08 20:36:09 +00:00
uu.py	Merged revisions 86037 via svnmerge from	2010-10-31 16:17:36 +00:00
uuid.py	Merged revisions 86192 via svnmerge from	2010-11-05 14:56:16 +00:00
warnings.py	Merged revisions 78757 via svnmerge from	2010-08-02 21:35:06 +00:00
wave.py	Merged revisions 85970 via svnmerge from	2010-11-20 11:29:09 +00:00
weakref.py	Backport of weakref.WeakSet and tests from Python 3.	2010-03-29 20:04:23 +00:00
webbrowser.py	Issue 10738: Fix webbrowser.Opera.raise_opts value.	2010-12-28 19:53:32 +00:00
whichdb.py	…
wsgiref.egg-info	…
xdrlib.py	Issue #9696: Fix exception incorrectly raised by xdrlib.Packer.pack_int when trying to pack a negative (in-range) integer.	2011-03-27 16:15:24 +01:00
xmllib.py	Merged revisions 72458 via svnmerge from	2009-05-08 02:47:02 +00:00
xmlrpclib.py	Fix Issue8194 - Fix incompatible API change in the parse_respones for xmlrpclib.	2010-12-07 07:10:04 +00:00
zipfile.py	Merged revisions 85455 via svnmerge from	2010-11-26 07:22:28 +00:00