cpython/Lib
Georg Brandl e85e1ae413 Merged revisions 82757-82758,82760-82764 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r82757 | georg.brandl | 2010-07-10 10:58:37 +0200 (Sa, 10 Jul 2010) | 1 line

  Fix markup.
........
  r82758 | georg.brandl | 2010-07-10 12:23:40 +0200 (Sa, 10 Jul 2010) | 1 line

  Emphasize role of count for Pascal string.
........
  r82760 | georg.brandl | 2010-07-10 12:39:57 +0200 (Sa, 10 Jul 2010) | 1 line

  #3214: improve description of duck-typing in glossary.
........
  r82761 | georg.brandl | 2010-07-10 13:40:13 +0200 (Sa, 10 Jul 2010) | 1 line

  #1434090: properly append child in expatbuilder doctype handler.
........
  r82762 | georg.brandl | 2010-07-10 13:51:06 +0200 (Sa, 10 Jul 2010) | 1 line

  #8338: fix outdated class name.
........
  r82763 | georg.brandl | 2010-07-10 14:01:34 +0200 (Sa, 10 Jul 2010) | 1 line

  #8456: fix signature of sqlite3.connect().
........
  r82764 | georg.brandl | 2010-07-10 14:20:38 +0200 (Sa, 10 Jul 2010) | 1 line

  #8564: update docs on integrating doctest/unittest with unittest(2) test discovery.
........
2010-10-06 09:17:24 +00:00
..
bsddb stop CObject deprecation warnings in test___all__ 2010-04-03 16:06:42 +00:00
compiler make compiler's py3k warning a full deprecation warning #6837 2010-03-18 23:12:43 +00:00
ctypes Try harder on issue #7356: ctypes.util: Make parsing of ldconfig output 2010-09-15 13:01:19 +00:00
curses Merged revisions 83536,83546-83548,83550,83554-83555,83558,83563,83565,83571,83574-83575 via svnmerge from 2010-08-02 21:44:25 +00:00
distutils Merged revisions 84889 via svnmerge from 2010-09-19 03:12:28 +00:00
email Merged revisions 85179 via svnmerge from 2010-10-02 16:26:05 +00:00
encodings Issue #6213: Implement getstate() and setstate() methods of utf-8-sig and 2010-07-28 01:39:45 +00:00
hotshot #1019882: if start() and stop() were not in the same stack frame, stats.load() would crash with IndexError. 2010-07-31 21:22:36 +00:00
idlelib Merged revisions 83103 via svnmerge from 2010-07-23 16:55:21 +00:00
importlib Fix some more bugs caused by the backport from 3.x for importlib. 2009-03-04 01:00:53 +00:00
json Apply patch from Ray Allen for issue 9296 2010-07-21 12:36:33 +00:00
lib-tk Issue #6470: Drop UNC prefix in FixTk.py 2010-06-04 19:39:07 +00:00
lib2to3 Merged revisions 82530-82531,82779,82855,83740,83789-83791,83797-83801,83803,83811,83827,83844 via svnmerge from 2010-08-08 19:13:06 +00:00
logging logging: NullHandler optimisation. 2010-09-26 11:04:10 +00:00
msilib replace has_key with 'in' operator 2009-10-09 22:15:50 +00:00
multiprocessing Submit patch for bug 9144; broken imports due to r81380 2010-07-03 12:26:02 +00: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 Fix undefined local. 2010-02-08 22:37:52 +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
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 Issue #7449, last part (11): fix many tests if thread support is disabled 2010-04-27 23:55:59 +00:00
test Merged revisions 85223 via svnmerge from 2010-10-04 23:59:35 +00:00
unittest Fix error message for comparing single line strings in unittest.TestCase.assertEqual. 2010-07-10 13:51:42 +00:00
wsgiref Manually copy patch for bug 7250 from the release26-maint branch. I suck 2010-03-01 21:46:51 +00:00
xml Merged revisions 82757-82758,82760-82764 via svnmerge from 2010-10-06 09:17:24 +00:00
BaseHTTPServer.py Fix Issue7172 - BaseHTTPServer.BaseHTTPRequestHandler.responses[405] - changing 2010-02-22 10:55:08 +00:00
Bastion.py Deprecate Bastion and rexec for 3.0. 2008-05-10 02:27:04 +00:00
CGIHTTPServer.py Merged revisions 85202 via svnmerge from 2010-10-03 18:16:52 +00:00
ConfigParser.py fix output from RawConfigParser.write and ConfigParser.write for None 2010-09-03 03:55:50 +00:00
Cookie.py Merged revisions 83393,83396,83398,83405,83408 via svnmerge from 2010-08-01 18:52:52 +00:00
DocXMLRPCServer.py http://bugs.python.org/issue6267 2009-06-28 21:04:17 +00:00
HTMLParser.py Issue #6662: Fix parsing of malformatted charref (&#bad;) 2010-05-24 21:33:24 +00: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 Issue839496: SimpleHTTPServer should open all files in binary mode. 2008-07-06 21:34:39 +00:00
SimpleXMLRPCServer.py Issue 6654 2009-08-27 23:13:18 +00:00
SocketServer.py Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown, 2010-04-25 21:40:32 +00:00
StringIO.py make StringIO like other file objects in that readline(-1) has no effect #7348 2009-12-13 17:29:16 +00: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 83370,83372-83374,83384 via svnmerge from 2010-08-01 19:06:51 +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 84301 via svnmerge from 2010-08-24 21:09:30 +00:00
_pyio.py Merged revisions 84814 via svnmerge from 2010-09-14 18:48:19 +00: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 Backport of weakref.WeakSet and tests from Python 3. 2010-03-29 20:04:23 +00:00
abc.py Use weakrefs to hold onto classes #2521. 2010-08-21 03:03:22 +00:00
aifc.py Fix py3k warnings in the aifc module 2009-10-14 17:30:52 +00:00
antigravity.py easter egg 2008-10-15 11:49:10 +00:00
anydbm.py
argparse.py Merged revisions 83675 via svnmerge from 2010-08-03 18:14:01 +00:00
ast.py ast.literal_eval can properly evaluate complex numbers now. This fixes issue4907. 2009-01-13 11:52:23 +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 84284 via svnmerge from 2010-08-23 21:58:47 +00:00
atexit.py
audiodev.py Deprecate the audiodev module for 3.0. 2008-05-06 23:23:34 +00:00
base64.py
bdb.py Merged revisions 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from 2010-08-01 19:33:15 +00:00
binhex.py In a number of places code still revers 2010-05-05 19:09:31 +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 Fix some py3k warnings in the standard library. 2010-03-07 12:14:25 +00:00
cgi.py Merged revisions 83901 via svnmerge from 2010-08-09 20:18:04 +00:00
cgitb.py #7092: Fix some -3 warnings, and fix Lib/platform.py when the path contains a double-quote. 2010-04-01 18:17:09 +00:00
chunk.py
cmd.py Merged revisions 83380 via svnmerge from 2010-08-01 04:04:03 +00:00
code.py this main is much more useful 2009-11-12 23:42:23 +00:00
codecs.py Issue #6268: More bugfixes about BOM, UTF-16 and UTF-32 2010-05-22 13:37:56 +00:00
codeop.py
collections.py Issue 9826: OrderedDict.__repr__ did not play well with self-referencing dicts. 2010-09-13 22:14:36 +00:00
colorsys.py pep8tify conditionals 2009-01-30 02:02:25 +00:00
commands.py #4351: more appropriate DeprecationWarning stacklevels 2009-05-08 02:28:39 +00:00
compileall.py - Fix typo in Lib/compileall.py(__all__). 2010-03-15 18:00:01 +00:00
contextlib.py Remove markup from docstring 2009-06-23 10:51:02 +00:00
cookielib.py Fixes issue #3704: cookielib was not properly handling URLs with a / in the 2010-07-25 19:11:36 +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 Fix #1537721: add writeheader() method to csv.DictWriter. 2010-02-23 21:09:52 +00:00
dbhash.py spelling 2010-04-03 15:45:59 +00:00
decimal.py Merged revisions 82654 via svnmerge from 2010-07-08 21:22:54 +00:00
difflib.py Issue #7585: use tab between components in unified and context diff headers. 2010-04-12 16:35:19 +00:00
dircache.py Deprecate the dircache module for 3.0. 2008-05-10 21:12:57 +00:00
dis.py fix dis on new style classes #8310 2010-04-04 23:23:22 +00:00
doctest.py Merged revisions 84106 via svnmerge from 2010-08-16 20:30:26 +00: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 82766 via svnmerge from 2010-07-10 14:06:51 +00:00
formatter.py Issue #7092: Fix the DeprecationWarnings emitted by the standard library 2010-01-04 23:22:44 +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 Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT commands 2010-04-19 21:46:28 +00:00
functools.py #5341: fix typo and adapt docstring syntax. 2010-04-14 08:56:01 +00: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 83116 via svnmerge from 2010-07-24 01:07:52 +00:00
getpass.py Fixes issue7208 - getpass would still allow the password to be echoed on 2009-10-31 21:26:08 +00:00
gettext.py Merged revisions 85223 via svnmerge from 2010-10-04 23:59:35 +00:00
glob.py #5655: fix docstring oversight. 2009-04-01 17:46:01 +00:00
gzip.py Fix test_gzip failure on OS X. The failure was a result of trying to fflush 2010-05-04 18:45:27 +00:00
hashlib.py Adds the hashlib.algorithms attribute. See issue7418. 2010-03-01 02:01:47 +00:00
heapq.py Make life easier for non-CPython implementations. 2009-03-29 18:51:11 +00: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 Merged revisions 85205 via svnmerge from 2010-10-03 18:26:07 +00:00
ihooks.py Add support to the ihooks module for relative imports. 2009-10-14 19:23:53 +00:00
imaplib.py Merged revisions 83370,83372-83374,83384 via svnmerge from 2010-08-01 19:06:51 +00: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 In a number of places code still revers 2010-05-05 19:09:31 +00:00
inspect.py Merged revisions 84106 via svnmerge from 2010-08-16 20:30:26 +00:00
io.py Issue #6215: backport the 3.1 io lib 2009-06-12 20:14:08 +00:00
keyword.py
linecache.py simplify and modernize updatecache() 2010-05-21 21:35:44 +00:00
locale.py Issue #6656: fix locale.format_string to handle escaped percents and mappings. 2010-04-26 21:17:14 +00:00
macpath.py Merged revisions 84701,84784 via svnmerge from 2010-09-13 20:31:34 +00:00
macurl2path.py
mailbox.py Merged revisions 83385-83389,83391 via svnmerge from 2010-08-01 19:02:09 +00: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 No need to assign the results of expressions used only for side effects. 2010-02-06 22:59:15 +00:00
mimify.py
modulefinder.py Fixed a modulefinder crash on certain relative imports. 2008-10-30 20:18:13 +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 explicitly close the file, merged from py3k 2009-05-28 03:10:59 +00:00
new.py restricted environments are no more 2009-08-28 16:48:03 +00:00
nntplib.py Issue #1664: Make nntplib IPv6-capable. Patch by Derek Morr. 2009-05-14 21:22:08 +00:00
ntpath.py Merged revisions 83352,83356-83358,83362,83366,83368-83369 via svnmerge from 2010-08-01 19:14:56 +00:00
nturl2path.py Fixing issue5861 - test_urllib fails on windows. Agree to comment to have ':' in pathname2url as windows recognizes it. test_urllib passes now. 2009-05-05 17:34:42 +00:00
numbers.py Issue 4998: __slots__ on Fractions was useless. 2009-01-20 20:34:19 +00:00
opcode.py Issue #2333: Backport set and dict comprehensions syntax. 2010-01-11 22:36:12 +00:00
optparse.py #9161: Fix regression in acceptance of unicode strings in add_option calls. 2010-07-05 16:06:05 +00:00
os.py - Fix typo in os.execvp docstring. 2010-01-31 16:46:26 +00:00
os2emxpath.py #3426: os.path.abspath now returns unicode when its arg is unicode. 2010-02-20 08:09:39 +00:00
pdb.doc Untabify. 2010-06-27 11:24:15 +00:00
pdb.py Merged revisions 83259,83261,83264-83265,83268-83269,83271-83272,83281 via svnmerge from 2010-08-01 19:33: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 Merged revisions 82915 via svnmerge from 2010-07-16 14:53:52 +00:00
pipes.py #7507: quote "!" in pipes.quote(); it is a special character for some shells. 2010-04-24 09:08:10 +00:00
pkgutil.py Issue 2439: add pkgutils.get_data() as a convenience wrapper for the PEP 302 get_data() API (contributed by Paul Moore) 2008-04-15 10:25:31 +00:00
platform.py Merged revisions 83644 via svnmerge from 2010-08-03 07:44:35 +00: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
poplib.py Fixed the semantic of timeout for socket.create_connection and 2008-05-29 16:39:26 +00:00
posixfile.py
posixpath.py Added missing import. 2010-09-18 05:40:44 +00:00
pprint.py Issue #7092: Fix the DeprecationWarnings emitted by the standard library 2010-01-04 23:22:44 +00:00
profile.py Merged revisions 83524,84776 via svnmerge from 2010-09-13 17:36:36 +00:00
pstats.py Fix merging glitches. 2010-08-02 21:36:12 +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 Merged revisions 84173 via svnmerge from 2010-08-18 19:35:53 +00:00
quopri.py
random.py Issue 9816: Random.jumpahead(n) didn't work well for small values of n. 2010-09-10 10:47:22 +00:00
re.py Adds an optional flags argument to re.split, re.sub and re.subn to be 2009-03-02 05:13:57 +00: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 83238 via svnmerge from 2010-08-01 20:59:03 +00:00
runpy.py remove the svn:executable property from files that don't have shebang lines 2010-03-05 03:20:06 +00:00
sched.py #6112: list.remove raises ValueError, not RuntimeError. 2009-05-26 07:50:23 +00:00
sets.py Issue #7092: Fix the DeprecationWarnings emitted by the standard library 2010-01-04 23:22:44 +00:00
sgmllib.py #1651995: fix _convert_ref for non-ASCII characters. 2009-03-31 22:11:53 +00:00
sha.py
shelve.py Improve issue 7835 fix per MAL to handle the case that the 2010-02-11 01:56:42 +00:00
shlex.py
shutil.py removed non needed lines 2010-05-05 22:41:25 +00:00
site.py use a set for membership testing 2010-06-03 21:21:03 +00:00
smtpd.py Merged revisions 84289 via svnmerge from 2010-08-23 22:48:51 +00:00
smtplib.py Fix Issue #4066: smtplib.SMTP_SSL._get_socket now correctly returns 2009-05-23 00:48:58 +00:00
sndhdr.py Fix a py3k warning in the sndhdr module (found with test_email) 2009-10-14 18:31:05 +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 Issue #9729: Fix the signature of SSLSocket.recvfrom() and 2010-09-14 14:37:18 +00: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 Issue #7078: _struct.__doc__ was being ignored. Import it into struct. 2009-10-08 15:54:10 +00:00
subprocess.py Merged revisions 84582 via svnmerge from 2010-09-07 13:27:20 +00:00
sunau.py Issue #7092: Fix the DeprecationWarnings emitted by the standard library 2010-01-04 23:22:44 +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 Issue #2333: Backport set and dict comprehensions syntax. 2010-01-11 22:36:12 +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 Fix for issue #9164: with this patch sysconfig and distuls don't break 2010-07-11 08:52:52 +00:00
tabnanny.py
tarfile.py Merged revisions 85211 via svnmerge from 2010-10-04 15:37:53 +00:00
telnetlib.py Fixed the semantic of timeout for socket.create_connection and 2008-05-29 16:39:26 +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 Fix Issue8262 - changing RuntimeError wording to "Threads can only be started once" 2010-04-06 03:23:33 +00:00
timeit.py Merged revisions 83393,83396,83398,83405,83408 via svnmerge from 2010-08-01 18:52:52 +00:00
toaiff.py Deprecate the toaiff module for removal in 3.0. 2008-05-09 05:32:42 +00:00
token.py
tokenize.py some cleanups 2009-10-15 03:05:39 +00:00
trace.py Merged revisions 84994 via svnmerge from 2010-09-24 18:14:18 +00:00
traceback.py Issue #8313: traceback.format_exception_only() encodes unicode message to 2010-05-05 12:40:49 +00:00
tty.py
types.py remove more code for restricted execution 2009-08-28 16:49:56 +00:00
urllib.py Reverting the checkin made in revision 82940, as it was adding new parameters to quote function in a bugfix release. 2010-07-22 01:47:30 +00:00
urllib2.py Merged revisions 85025 via svnmerge from 2010-09-27 01:40:59 +00:00
urlparse.py Merged revisions 83901 via svnmerge from 2010-08-09 20:18:04 +00:00
user.py Deprecate the user module for removal in 3.0. 2008-05-08 20:36:09 +00:00
uu.py
uuid.py The uuid library on OSX 10.5 seems to contain the same bug as the one 2010-06-27 12:43:47 +00:00
warnings.py When DeprecationWarning was silenced by default, it also silenced any use of -Q 2010-04-25 22:33:36 +00:00
wave.py Issue #7092: Fix the DeprecationWarnings emitted by the standard library 2010-01-04 23:22:44 +00:00
weakref.py Backport of weakref.WeakSet and tests from Python 3. 2010-03-29 20:04:23 +00:00
webbrowser.py Fix for issue8446: 2010-06-22 09:18:28 +00:00
whichdb.py
wsgiref.egg-info
xdrlib.py
xmllib.py #4351: more appropriate DeprecationWarning stacklevels 2009-05-08 02:28:39 +00:00
xmlrpclib.py Backport of 83120 (#9032) 2010-07-24 02:51:49 +00:00
zipfile.py Merged revisions 84737 via svnmerge from 2010-09-12 14:56:27 +00:00