Benjamin Peterson 095c1199ff Merged revisions 65168 via svnmerge from ... svn+ssh://pythondev@svn.python.org/python/trunk ........ r65168 | facundo.batista | 2008-07-21 09:28:17 -0500 (Mon, 21 Jul 2008) | 5 lines Issue 3396. Fixed the autocompletion of 'int.', and worked a little that part of the code, fixing a detail and enhancing a bit others. ........		2008-07-21 16:32:10 +00:00
..
bsddb	fix more threading API related bugs	2008-06-13 02:00:47 +00:00
ctypes	Merged revisions 64979 via svnmerge from	2008-07-15 20:23:33 +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	Make db modules' error classes inherit IOError.	2008-05-28 08:43:17 +00:00
distutils	Bumping to 3.0b2	2008-07-18 02:28:44 +00:00
email	Make a new urllib package .	2008-06-18 20:49:58 +00:00
encodings	Move the codec decode type checks to bytes/bytearray.decode().	2008-06-06 12:18:17 +00:00
html	Change test_htmlparser to reflect the HTMLParser -> html.parser	2008-05-21 13:51:18 +00:00
http	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
idlelib	xrange -> range.	2008-07-19 13:53:58 +00:00
json	Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge from	2008-05-08 17:18:53 +00:00
lib2to3	Merged revisions 65141 via svnmerge from	2008-07-19 14:19:28 +00:00
logging	Merged revisions 64475,64544-64545,64550,64557-64558,64565,64570,64577,64582-64583,64585,64590,64592-64593,64625,64630,64638,64647,64655-64656,64663-64664 via svnmerge from	2008-07-02 20:22:54 +00:00
msilib	long integer -> integer.	2007-11-29 18:48:53 +00:00
multiprocessing	Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from	2008-07-16 12:55:28 +00:00
plat-aix4	…
plat-atheos	…
plat-freebsd4	…
plat-freebsd5	…
plat-freebsd6	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
plat-freebsd7	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
plat-freebsd8	Merged revisions 58221-58741 via svnmerge from	2007-11-01 19:42:39 +00:00
plat-generic	…
plat-linux2	…
plat-netbsd1	…
plat-next3	…
plat-os2emx	Merged revisions 62021,62029,62035-62038,62043-62044,62052-62053 via svnmerge from	2008-03-31 01:51:45 +00:00
plat-sunos5	…
plat-unixware7	…
site-packages	…
sqlite3	Merged revisions 63562,63570,63728,63734,63784,63788,63802,63817,63827,63839,63887,63975,63998 via svnmerge from	2008-06-10 17:40:04 +00:00
test	Merged revisions 65163 via svnmerge from	2008-07-20 23:21:49 +00:00
tkinter	Patch #3064: Port new turtle module and demos to 3.0.	2008-06-10 04:44:07 +00:00
urllib	Bug 3347: robotparser failed because it didn't convert bytes to string.	2008-07-18 20:59:44 +00:00
wsgiref	Make a new urllib package .	2008-06-18 20:49:58 +00:00
xml	Make a new urllib package .	2008-06-18 20:49:58 +00:00
xmlrpc	Make a new urllib package .	2008-06-18 20:49:58 +00:00
__future__.py	Merged revisions 61952-61953 via svnmerge from	2008-03-26 22:34:47 +00:00
__phello__.foo.py	…
_abcoll.py	Merged revisions 64475,64544-64545,64550,64557-64558,64565,64570,64577,64582-64583,64585,64590,64592-64593,64625,64630,64638,64647,64655-64656,64663-64664 via svnmerge from	2008-07-02 20:22:54 +00:00
_dummy_thread.py	Merged revisions 64903 via svnmerge from	2008-07-13 01:19:15 +00:00
_markupbase.py	Remove the htmllib and sgmllib modules as per PEP 3108.	2008-06-01 21:25:55 +00:00
_strptime.py	Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875.	2008-05-25 13:05:15 +00:00
_threading_local.py	Merged revisions 64125 via svnmerge from	2008-06-11 19:14:14 +00:00
_weakrefset.py	Add a test suite for WeakSet mostly derived from test_set and fix some	2008-05-18 16:27:29 +00:00
abc.py	Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61062,61066,61068,61070,61083,61085,61092-61103 via svnmerge from	2008-02-28 12:27:11 +00:00
aifc.py	Remove cl usage from aifc and use bytes throughout.	2008-06-07 19:01:03 +00:00
ast.py	Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from	2008-07-02 17:30:14 +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	Merged revisions 65152 via svnmerge from	2008-07-20 07:31:30 +00:00
base64.py	Removed implicit convertions of str object to bytes from base64.	2008-05-03 04:39:38 +00:00
bdb.py	Rename the repr module to reprlib.	2008-05-16 07:12:44 +00:00
binhex.py	Remove the Mac modules	2008-05-12 22:25:16 +00:00
bisect.py	Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from	2008-07-16 12:55:28 +00:00
build_class.py	…
cProfile.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
calendar.py	#3059: Stop decoding Unicode in calendar module.	2008-06-08 08:40:05 +00:00
cgi.py	Merged revisions 64434-64435,64440-64443,64445,64447-64448,64450,64452,64455,64461,64464,64466,64468 via svnmerge from	2008-07-02 17:30:14 +00:00
cgitb.py	…
chunk.py	…
cmd.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
code.py	Fix issue #1707. When raw_input() was removed, it was incorrectly replaced	2008-01-02 02:55:27 +00:00
codecs.py	Make TextIOWrapper's seek/tell work properly with stateful decoders;	2008-03-18 04:51:32 +00:00
codeop.py	…
collections.py	Merged revisions 64002-64003,64012,64036-64037,64047,64050-64052,64054-64055,64066,64071 via svnmerge from	2008-06-10 19:20:26 +00:00
colorsys.py	…
compileall.py	Merged revisions 61209-61214,61217-61222,61224-61226,61233-61237 via svnmerge from	2008-03-04 23:39:23 +00:00
configparser.py	Renamed ConfigParser to configparser.	2008-05-14 22:59:42 +00:00
contextlib.py	Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from	2008-05-04 22:42:01 +00:00
copy.py	Rename the repr module to reprlib.	2008-05-16 07:12:44 +00:00
copyreg.py	Rename copy_reg module to copyreg.	2008-05-11 08:55:36 +00:00
csv.py	Obvious simplification, now that "long" has disappeared.	2008-04-24 18:26:53 +00:00
decimal.py	Manual forward port of 64962 - use PyObject_HashNotImplemented as a tp_hash level indicator that the default hash implementation has not been inherited	2008-07-15 15:46:38 +00:00
difflib.py	Merged revisions 59883-59920 via svnmerge from	2008-01-11 16:17:00 +00:00
dis.py	Fixed isinstance() check in dis.dis().	2008-06-04 20:26:54 +00:00
doctest.py	#2630: Implement PEP 3138.	2008-06-11 18:37:52 +00:00
dummy_threading.py	Rename thread to _thread and dummy_thread to _dummy_thread. Issue #2875.	2008-05-25 13:05:15 +00:00
filecmp.py	Move itertools izip() code to builtins as zip(). Complete the renaming.	2008-03-13 02:09:15 +00:00
fileinput.py	Patch 1341 by Amaury Forgeot d'Arc.	2007-10-29 17:39:59 +00:00
fnmatch.py	…
formatter.py	Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from	2008-01-21 20:36:10 +00:00
fractions.py	Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from	2008-07-16 12:55:28 +00:00
ftplib.py	Merged revisions 63562,63570,63728,63734,63784,63788,63802,63817,63827,63839,63887,63975,63998 via svnmerge from	2008-06-10 17:40:04 +00:00
functools.py	…
genericpath.py	…
getopt.py	…
getpass.py	Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from	2008-05-04 22:42:01 +00:00
gettext.py	Make gettext Unicode interface consistent and clean up the docs.	2008-07-17 18:15:35 +00:00
glob.py	Fix build error.	2008-01-27 16:16:19 +00:00
gzip.py	Merged revisions 63412,63445-63447,63449-63450,63452,63454,63459,63463,63465,63470,63483-63484,63496-63497,63499-63501,63530-63531,63540,63614 via svnmerge from	2008-05-25 18:19:30 +00:00
hashlib.py	Merged revisions 61538-61540,61556,61559-61560,61563,61565,61571,61575-61576,61580-61582,61586,61591,61593,61595,61605-61606,61613-61616,61618,61621-61623,61625,61627,61631-61634 via svnmerge from	2008-03-19 21:50:51 +00:00
heapq.py	Merged revisions 63562,63570,63728,63734,63784,63788,63802,63817,63827,63839,63887,63975,63998 via svnmerge from	2008-06-10 17:40:04 +00:00
hmac.py	Fixed failing unit tests due to str/bytes mismatch.	2008-03-03 02:59:49 +00:00
imaplib.py	Merged revisions 61003-61033 via svnmerge from	2008-02-24 00:38:49 +00:00
imghdr.py	…
inspect.py	#3021: Antoine Pitrou's Lexical exception handlers	2008-06-11 15:59:43 +00:00
io.py	Fixed test_tempfile.	2008-06-12 01:13:54 +00:00
keyword.py	Merged revisions 60151-60159,60161-60168,60170,60172-60173,60175 via svnmerge from	2008-01-21 20:36:10 +00:00
linecache.py	Remove the imputil module.	2008-05-08 18:11:25 +00:00
locale.py	Merged revisions 63724,63726,63732,63744,63754-63755,63757-63758,63760,63775,63781-63782,63787,63805-63808,63818-63819,63823-63824 via svnmerge from	2008-06-10 16:57:31 +00:00
macpath.py	Remove os.path.walk	2008-05-08 23:44:58 +00:00
macurl2path.py	Make a new urllib package .	2008-06-18 20:49:58 +00:00
mailbox.py	#756982: Remove rfc822 reference.	2008-05-11 20:51:18 +00:00
mailcap.py	…
mimetypes.py	Make a new urllib package .	2008-06-18 20:49:58 +00:00
modulefinder.py	Merged revisions 59193-59201 via svnmerge from	2007-11-27 21:50:00 +00:00
netrc.py	Patch # 1331 by Christian Heimes.	2007-10-26 04:29:23 +00:00
nntplib.py	…
ntpath.py	Remove os.path.walk	2008-05-08 23:44:58 +00:00
nturl2path.py	follow-up of r64385: rename urllib.quote in nturl2path	2008-06-18 22:38:24 +00:00
numbers.py	Merged revisions 61404-61407 via svnmerge from	2008-03-16 00:32:36 +00:00
opcode.py	Remove MAKE_BYTES which is a leftover from the mutable byte literal time.	2008-07-20 21:38:50 +00:00
optparse.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
os.py	Merged revisions 63119-63128,63130-63131,63133,63135-63144,63146-63148,63151-63152,63155-63165,63167-63176,63181-63186,63188-63189 via svnmerge from	2008-05-16 02:54:33 +00:00
os2emxpath.py	Remove os.path.walk	2008-05-08 23:44:58 +00:00
pdb.doc	Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from	2008-05-16 00:03:33 +00:00
pdb.py	Rename the repr module to reprlib.	2008-05-16 07:12:44 +00:00
pickle.py	Restore _pickle module accelerator module.	2008-06-12 18:26:05 +00:00
pickletools.py	Restore _pickle module accelerator module.	2008-06-12 18:26:05 +00:00
pipes.py	…
pkgutil.py	Merged revisions 62350-62355,62358-62359,62364-62365,62370,62372-62375,62378-62379,62381 via svnmerge from	2008-04-19 00:55:37 +00:00
platform.py	Merge error: platform.py would not import	2008-06-17 21:42:46 +00:00
plistlib.py	Remove the Mac modules	2008-05-12 22:25:16 +00:00
poplib.py	Merged revisions 63562,63570,63728,63734,63784,63788,63802,63817,63827,63839,63887,63975,63998 via svnmerge from	2008-06-10 17:40:04 +00:00
posixpath.py	Remove os.path.walk	2008-05-08 23:44:58 +00:00
pprint.py	Merged revisions 63119-63128,63130-63131,63133,63135-63144,63146-63148,63151-63152,63155-63165,63167-63176,63181-63186,63188-63189 via svnmerge from	2008-05-16 02:54:33 +00:00
profile.py	…
pstats.py	Issue #1771: Remove cmp parameter from list.sort() and builtin.sorted().	2008-01-30 20:15:17 +00:00
pty.py	…
py_compile.py	Merged revisions 61239-61249,61252-61257,61260-61264,61269-61275,61278-61279,61285-61286,61288-61290,61298,61303-61305,61312-61314,61317,61329,61332,61344,61350-61351,61363-61376,61378-61379,61382-61383,61387-61388,61392,61395-61396,61402-61403 via svnmerge from	2008-03-16 00:07:10 +00:00
pyclbr.py	Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from	2008-05-04 22:42:01 +00:00
pydoc.py	Merged revisions 64475,64544-64545,64550,64557-64558,64565,64570,64577,64582-64583,64585,64590,64592-64593,64625,64630,64638,64647,64655-64656,64663-64664 via svnmerge from	2008-07-02 20:22:54 +00:00
pydoc_topics.py	Merged revisions 63871 via svnmerge from	2008-06-01 21:05:17 +00:00
queue.py	Merged revisions 64125 via svnmerge from	2008-06-11 19:14:14 +00:00
quopri.py	Patch 1329 (partial) by Christian Heimes.	2007-10-30 17:27:30 +00:00
random.py	Merged revisions 61724-61725,61731-61735,61737,61739,61741,61743-61744,61753,61761,61765-61767,61769,61773,61776-61778,61780-61783,61788,61793,61796,61807,61813 via svnmerge from	2008-03-23 21:54:12 +00:00
re.py	Rename copy_reg module to copyreg.	2008-05-11 08:55:36 +00:00
reprlib.py	Rename the repr module file to reprlib.py.	2008-05-16 16:05:36 +00:00
rlcompleter.py	Merged revisions 65168 via svnmerge from	2008-07-21 16:32:10 +00:00
runpy.py	Merged revisions 60481,60485,60489-60492,60494-60496,60498-60499,60501-60503,60505-60506,60508-60509,60523-60524,60532,60543,60545,60547-60548,60552,60554,60556-60559,60561-60562,60569,60571-60572,60574,60576-60583,60585-60586,60589,60591,60594-60595,60597-60598,60600-60601,60606-60612,60615,60617,60619-60621,60623-60625,60627-60629,60631,60633,60635,60647,60650,60652,60654,60656,60658-60659,60664-60666,60668-60670,60672,60676,60678,60680-60683,60685-60686,60688,60690,60692-60694,60697-60700,60705-60706,60708,60711,60714,60720,60724-60730,60732,60736,60742,60744,60746,60748,60750-60751,60753,60756-60757,60759-60761,60763-60764,60766,60769-60770,60774-60784,60787-60789,60793,60796,60799-60809,60812-60813,60815-60821,60823-60826,60828-60829,60831-60834,60836,60838-60839,60846-60849,60852-60854,60856-60859,60861-60870,60874-60875,60880-60881,60886,60888-60890,60892,60894-60898,60900-60931,60933-60958 via svnmerge from	2008-02-22 16:37:40 +00:00
sched.py	Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from	2008-05-16 00:41:41 +00:00
shelve.py	Create the dbm package from PEP 3108. #2881.	2008-05-26 10:29:35 +00:00
shlex.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
shutil.py	Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from	2008-07-16 12:55:28 +00:00
site.py	Merged revisions 62954-62959,62961,62963-62967,62969-62970,62972-62973,62975-62976,62978-62982,62984,62987-62996 via svnmerge from	2008-05-15 22:51:26 +00:00
smtpd.py	Committing Py3k version of changelist 64080 and 64257, along with updated tests	2008-07-07 04:15:08 +00:00
smtplib.py	Remove traces of rfc822.	2008-06-12 22:23:59 +00:00
sndhdr.py	…
socket.py	Merged revisions 63562,63570,63728,63734,63784,63788,63802,63817,63827,63839,63887,63975,63998 via svnmerge from	2008-06-10 17:40:04 +00:00
socketserver.py	fix more threading API related bugs	2008-06-13 02:00:47 +00:00
sre_compile.py	Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from	2008-04-09 08:37:03 +00:00
sre_constants.py	…
sre_parse.py	Fix 're' to work on bytes. It could do with a few more tests, though.	2008-03-18 20:19:54 +00:00
ssl.py	fix bad method names in ssl module (and typo in ssl doc)	2008-06-29 00:05:51 +00:00
stat.py	Merged revisions 61644,61646-61647,61649-61652,61656-61658,61663,61665,61667 via svnmerge from	2008-03-20 10:49:03 +00:00
string.py	Rename buffer -> bytearray.	2007-11-21 19:29:53 +00:00
stringprep.py	…
struct.py	Merged revisions 59696-59702 via svnmerge from	2008-01-04 03:08:33 +00:00
subprocess.py	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
sunau.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
sunaudio.py	…
symbol.py	…
symtable.py	…
tabnanny.py	…
tarfile.py	Merged revisions 63724,63726,63732,63744,63754-63755,63757-63758,63760,63775,63781-63782,63787,63805-63808,63818-63819,63823-63824 via svnmerge from	2008-06-10 16:57:31 +00:00
telnetlib.py	Merged revisions 63562,63570,63728,63734,63784,63788,63802,63817,63827,63839,63887,63975,63998 via svnmerge from	2008-06-10 17:40:04 +00:00
tempfile.py	Fixed test_tempfile.	2008-06-12 01:13:54 +00:00
textwrap.py	Merged revisions 62998-63003,63005-63006,63009-63012,63014-63017,63019-63020,63022-63024,63026-63029,63031-63041,63043-63045,63047-63054,63056-63062 via svnmerge from	2008-05-16 00:03:33 +00:00
this.py	…
threading.py	Merger 65032 to py3k	2008-07-17 16:49:17 +00:00
timeit.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
token.py	Merged revisions 61038,61042-61045,61047,61050,61053,61055-61056,61061-61064,61066-61080 via svnmerge from	2008-02-26 08:18:30 +00:00
tokenize.py	use the more idomatic (and Py3k faster) while True	2008-06-05 23:07:42 +00:00
trace.py	Bug #2606: Avoid calling .sort() on a dict_keys object.	2008-04-10 19:02:25 +00:00
traceback.py	implement chained exception tracebacks	2008-07-15 15:32:09 +00:00
tty.py	…
types.py	Merged revisions 62194,62197-62198,62204-62205,62214,62219-62221,62227,62229-62231,62233-62235,62237-62239 via svnmerge from	2008-04-09 08:37:03 +00:00
unittest.py	Merged revisions 63066-63076,63079,63081-63085,63087-63097,63099,63101-63104 via svnmerge from	2008-05-16 00:41:41 +00:00
uu.py	Patch# 1258 by Christian Heimes: kill basestring.	2007-10-16 18:12:55 +00:00
uuid.py	Rename buffer -> bytearray.	2007-11-21 19:29:53 +00:00
warnings.py	Merged revisions 64549 via svnmerge from	2008-06-27 00:52:15 +00:00
wave.py	#1535: rename __builtin__ module to builtins.	2007-12-02 09:40:06 +00:00
weakref.py	Merged revisions 62425-62429,62434-62436,62441,62444,62446-62448,62450-62455,62463,62465-62466,62469,62474,62476-62478,62480,62485,62492,62497-62498,62500,62507,62513-62514,62516,62521,62531,62535,62545-62546,62548-62551,62553-62559,62569,62574,62577,62593,62595,62604-62606,62608,62616,62626-62627,62636,62638,62644-62645,62647-62648,62651-62653,62656,62661,62663,62680,62686-62687,62696,62699-62703,62711 via svnmerge from	2008-05-04 22:42:01 +00:00
webbrowser.py	#Issue2835: Correct an infinite recursion in webbrowser.open(), when KDE Konqueror is tried.	2008-05-12 14:41:00 +00:00
wsgiref.egg-info	…
xdrlib.py	…
zipfile.py	Merged revisions 64722,64729,64753,64845-64846,64849,64871,64880-64882,64885,64888,64897,64900-64901,64915,64926-64929,64938-64941,64944,64961,64966,64973 via svnmerge from	2008-07-16 12:55:28 +00:00