]> granicus.if.org Git - python/log
python
14 years agoIssue #9516: Merge Distutils changes from 3.2
Ned Deily [Wed, 29 Jun 2011 03:01:52 +0000 (20:01 -0700)]
Issue #9516: Merge Distutils changes from 3.2

14 years agoIssue #9516: Update Misc/NEWS.
Ned Deily [Wed, 29 Jun 2011 02:51:30 +0000 (19:51 -0700)]
Issue #9516: Update Misc/NEWS.

14 years agoIssue #9516: Change distutils to no longer globally attempt to check and
Ned Deily [Wed, 29 Jun 2011 02:44:24 +0000 (19:44 -0700)]
Issue #9516: Change distutils to no longer globally attempt to check and
set the MACOSX_DEPLOYMENT_TARGET env variable for the interpreter process
on OS X.  This could cause failures in non-distutils subprocesses and was
unreliable since tests or user programs could modify the interpreter
environment after distutils set it.  Instead, have distutils set the
the deployment target only in the environment of each build subprocess.

Continue to use the previous algorithm for deriving the deployment target
value:
    if MACOSX_DEPLOYMENT_TARGET is not set in the interpreter's env:
        use the interpreter build configure MACOSX_DEPLOYMENT_TARGET
    elif the MACOSX_DEPLOYMENT_TARGET env value >= configure value:
        use the env MACOSX_DEPLOYMENT_TARGET
    else: # env value less than interpreter build configure value
        raise exception
This allows building extensions that can only run on newer versions of
the OS than the version python was built for, for example with a python
built for 10.3 or later and an extension that needs to be built for 10.5.

14 years agoIssue #9516: Correct and expand OS X deployment target tests in distutils
Ned Deily [Wed, 29 Jun 2011 02:43:15 +0000 (19:43 -0700)]
Issue #9516: Correct and expand OS X deployment target tests in distutils
test_build_ext.

14 years agoremove unused imports (closes #12432)
Benjamin Peterson [Tue, 28 Jun 2011 15:25:04 +0000 (10:25 -0500)]
remove unused imports (closes #12432)

A patch from Vincent Legoll.

14 years agouse the Include in srcdir
Benjamin Peterson [Tue, 28 Jun 2011 14:26:39 +0000 (09:26 -0500)]
use the Include in srcdir

14 years agoIssue #12141: Install copies of template C module file so that
Ned Deily [Tue, 28 Jun 2011 07:53:54 +0000 (00:53 -0700)]
Issue #12141: Install copies of template C module file so that
test_build_ext of test_distutils and test_command_build_ext of
test_packaging are no longer silently skipped when
run outside of a build directory.

14 years agoIssue #12141: Install a copy of template C module file so that
Ned Deily [Tue, 28 Jun 2011 07:42:50 +0000 (00:42 -0700)]
Issue #12141: Install a copy of template C module file so that
test_build_ext of test_distutils is no longer silently skipped when
run outside of a build directory.

14 years agoIssue #8746: Correct faulty configure checks so that os.chflags() and
Ned Deily [Tue, 28 Jun 2011 07:13:01 +0000 (00:13 -0700)]
Issue #8746: Correct faulty configure checks so that os.chflags() and
os.lchflags() are once again built on systems that support these
functions (*BSD and OS X).  Also add new stat file flags for OS X
(UF_HIDDEN and UF_COMPRESSED).  Also add additional tests for
os.chflags() and os.lchflags(). (Tests by Garrett Cooper)

14 years agoIssue #8746: Correct faulty configure checks so that os.chflags() and
Ned Deily [Tue, 28 Jun 2011 07:00:28 +0000 (00:00 -0700)]
Issue #8746: Correct faulty configure checks so that os.chflags() and
os.lchflags() are once again built on systems that support these
functions (*BSD and OS X).  Also add new stat file flags for OS X
(UF_HIDDEN and UF_COMPRESSED).  Also add additional tests for
os.chflags() and os.lchflags(). (Tests by Garrett Cooper)

14 years agoIssue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
Ned Deily [Tue, 28 Jun 2011 06:18:45 +0000 (23:18 -0700)]
Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
2.8 +  on Mac OS X.  (Patch by Ronald Oussoren)

14 years agoIssue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
Ned Deily [Tue, 28 Jun 2011 06:12:20 +0000 (23:12 -0700)]
Issue #10736: Fix test_ttk test_widgets failures with Cocoa Tk 8.5.9
on Mac OS X.  (Patch by Ronald Oussoren)

14 years agogeneral cleaning up
Benjamin Peterson [Mon, 27 Jun 2011 23:25:06 +0000 (18:25 -0500)]
general cleaning up

14 years agoremove svn support
Benjamin Peterson [Mon, 27 Jun 2011 22:59:45 +0000 (17:59 -0500)]
remove svn support

14 years agomerge 3.2
Benjamin Peterson [Mon, 27 Jun 2011 22:51:44 +0000 (17:51 -0500)]
merge 3.2

14 years agofix ws
Benjamin Peterson [Mon, 27 Jun 2011 22:51:18 +0000 (17:51 -0500)]
fix ws

14 years agomerge 3.2 (#11302)
Benjamin Peterson [Mon, 27 Jun 2011 22:50:14 +0000 (17:50 -0500)]
merge 3.2 (#11302)

14 years agoadd more ast tests (closes #11302)
Benjamin Peterson [Mon, 27 Jun 2011 22:46:06 +0000 (17:46 -0500)]
add more ast tests (closes #11302)

A patch from Vincent Legoll.

14 years agodon't memoize objects that are their own copies (closes #12422)
Benjamin Peterson [Mon, 27 Jun 2011 21:22:46 +0000 (16:22 -0500)]
don't memoize objects that are their own copies (closes #12422)

Patch mostly by Alex Gaynor.

14 years agomerge from 3.2
Senthil Kumaran [Mon, 27 Jun 2011 16:07:14 +0000 (09:07 -0700)]
merge from 3.2

14 years agoFix closes Issue12385 - Clarify maketrans method docstring for bytes and bytearray...
Senthil Kumaran [Mon, 27 Jun 2011 16:06:45 +0000 (09:06 -0700)]
Fix closes Issue12385 - Clarify maketrans method docstring for bytes and bytearray object.

14 years agoCloses #12419: Added ident to SysLogHandler.
Vinay Sajip [Mon, 27 Jun 2011 14:40:06 +0000 (15:40 +0100)]
Closes #12419: Added ident to SysLogHandler.

14 years agomerge 3.2
Benjamin Peterson [Mon, 27 Jun 2011 14:19:02 +0000 (09:19 -0500)]
merge 3.2

14 years agostrip trailing ws
Benjamin Peterson [Mon, 27 Jun 2011 14:18:46 +0000 (09:18 -0500)]
strip trailing ws

14 years agomerge heads
Benjamin Peterson [Mon, 27 Jun 2011 14:16:47 +0000 (09:16 -0500)]
merge heads

14 years agomerge 3.2
Benjamin Peterson [Mon, 27 Jun 2011 14:16:40 +0000 (09:16 -0500)]
merge 3.2

14 years agomerge heads
Benjamin Peterson [Mon, 27 Jun 2011 14:16:14 +0000 (09:16 -0500)]
merge heads

14 years agomerge 3.2 (#12417)
Benjamin Peterson [Mon, 27 Jun 2011 14:15:19 +0000 (09:15 -0500)]
merge 3.2 (#12417)

14 years agoupdate profile license (closes #12417)
Benjamin Peterson [Mon, 27 Jun 2011 14:14:34 +0000 (09:14 -0500)]
update profile license (closes #12417)

14 years agoIssue 12139: add CCC command support to FTP_TLS class to revert the SSL connection...
Giampaolo Rodola' [Mon, 27 Jun 2011 09:17:51 +0000 (11:17 +0200)]
Issue 12139: add CCC command support to FTP_TLS class to revert the SSL connection back to clear-text.

14 years agomerge from 3.2
Senthil Kumaran [Mon, 27 Jun 2011 06:49:49 +0000 (23:49 -0700)]
merge from 3.2

14 years agoFix closes issue 11568 - update select.epoll.register docstring with mention of corre...
Senthil Kumaran [Mon, 27 Jun 2011 06:48:23 +0000 (23:48 -0700)]
Fix closes issue 11568 - update select.epoll.register docstring with mention of correct behavior.

14 years agoIssue #8890: Remove /tmp from examples.
Raymond Hettinger [Sun, 26 Jun 2011 13:29:27 +0000 (15:29 +0200)]
Issue #8890: Remove /tmp from examples.

14 years agoIssue #8890: Remove /tmp from examples.
Raymond Hettinger [Sun, 26 Jun 2011 13:29:06 +0000 (15:29 +0200)]
Issue #8890: Remove /tmp from examples.

14 years agoIssue #4608: urllib.request.urlopen does not return an iterable object
Raymond Hettinger [Sun, 26 Jun 2011 12:30:25 +0000 (14:30 +0200)]
Issue #4608: urllib.request.urlopen does not return an iterable object

14 years agoIssue #4608: urllib.request.urlopen does not return an iterable object
Raymond Hettinger [Sun, 26 Jun 2011 12:29:35 +0000 (14:29 +0200)]
Issue #4608: urllib.request.urlopen does not return an iterable object

14 years ago#11363: merge with 3.2.
Ezio Melotti [Sun, 26 Jun 2011 10:39:35 +0000 (13:39 +0300)]
#11363: merge with 3.2.

14 years ago#11363: add missing functions from curses doc. Patch by Sandro Tosi.
Ezio Melotti [Sun, 26 Jun 2011 10:34:56 +0000 (13:34 +0300)]
#11363: add missing functions from curses doc. Patch by Sandro Tosi.

14 years ago#11363: clean up curses doc.
Ezio Melotti [Sun, 26 Jun 2011 10:38:11 +0000 (13:38 +0300)]
#11363: clean up curses doc.

14 years ago#11669: merge with 3.2.
Ezio Melotti [Sun, 26 Jun 2011 08:38:08 +0000 (11:38 +0300)]
#11669: merge with 3.2.

14 years ago#11669: rephrase footnote in the Compound Statements page.
Ezio Melotti [Sun, 26 Jun 2011 08:25:28 +0000 (11:25 +0300)]
#11669: rephrase footnote in the Compound Statements page.

14 years agomap cells to arg slots at code creation time (closes #12399)
Benjamin Peterson [Sun, 26 Jun 2011 03:54:45 +0000 (22:54 -0500)]
map cells to arg slots at code creation time (closes #12399)

This removes nested loops in PyEval_EvalCodeEx.

14 years agoMerge heads.
Ezio Melotti [Sat, 25 Jun 2011 17:30:52 +0000 (20:30 +0300)]
Merge heads.

14 years agoBacked out changeset ef306bd1d122
Ezio Melotti [Sat, 25 Jun 2011 17:10:39 +0000 (20:10 +0300)]
Backed out changeset ef306bd1d122

14 years agoUse correct markup in zipimport.rst. Patch by Sara Magliacane.
Ezio Melotti [Sat, 25 Jun 2011 16:40:06 +0000 (19:40 +0300)]
Use correct markup in zipimport.rst. Patch by Sara Magliacane.

14 years agoUse correct markup in zipimport.rst. Patch by Sara Magliacane.
Ezio Melotti [Sat, 25 Jun 2011 16:40:06 +0000 (19:40 +0300)]
Use correct markup in zipimport.rst. Patch by Sara Magliacane.

14 years agoIssue 11802: filecmp cache was growing without bound.
Raymond Hettinger [Sat, 25 Jun 2011 15:20:21 +0000 (17:20 +0200)]
Issue 11802:  filecmp cache was growing without bound.

14 years agoIssue 12086: add example showing how to use name mangling.
Raymond Hettinger [Sat, 25 Jun 2011 14:30:39 +0000 (16:30 +0200)]
Issue 12086: add example showing how to use name mangling.

14 years agoIssue 11889: Clarify docs for enumerate.
Raymond Hettinger [Sat, 25 Jun 2011 13:00:14 +0000 (15:00 +0200)]
Issue 11889: Clarify docs for enumerate.

14 years agoIssue #12408: Fix relative import in test_future5.py. Thanks Cesare Di Mauro.
Mark Dickinson [Sat, 25 Jun 2011 11:29:14 +0000 (13:29 +0200)]
Issue #12408: Fix relative import in test_future5.py.  Thanks Cesare Di Mauro.

14 years agoMerge #12228
Mark Dickinson [Sat, 25 Jun 2011 10:04:08 +0000 (12:04 +0200)]
Merge #12228

14 years agoIssue #12228: Fix exchanged flag descriptions in stat.rst. Thanks Sandro Tosi.
Mark Dickinson [Sat, 25 Jun 2011 10:03:33 +0000 (12:03 +0200)]
Issue #12228: Fix exchanged flag descriptions in stat.rst.  Thanks Sandro Tosi.

14 years agomerge
Raymond Hettinger [Sat, 25 Jun 2011 09:50:00 +0000 (11:50 +0200)]
merge

14 years agoFix typo (reported by Hiro Ashiya).
Raymond Hettinger [Sat, 25 Jun 2011 09:39:00 +0000 (11:39 +0200)]
Fix typo (reported by Hiro Ashiya).

14 years ago#12341: add coverage files/dirs to .hgignore. Patch by Sandro Tosi.
Ezio Melotti [Sat, 25 Jun 2011 09:36:38 +0000 (12:36 +0300)]
#12341: add coverage files/dirs to .hgignore. Patch by Sandro Tosi.

14 years agoIssue 11802: filecmp cache was growing without bound.
Raymond Hettinger [Sat, 25 Jun 2011 15:21:04 +0000 (17:21 +0200)]
Issue 11802:  filecmp cache was growing without bound.

14 years agoIssue 12086: add example showing how to use name mangling.
Raymond Hettinger [Sat, 25 Jun 2011 14:31:06 +0000 (16:31 +0200)]
Issue 12086: add example showing how to use name mangling.

14 years agoIssue 11758: increase xml.dom.minidom test coverage (contributed by mdorn, reviewed...
Raymond Hettinger [Sat, 25 Jun 2011 13:54:52 +0000 (15:54 +0200)]
Issue 11758: increase xml.dom.minidom test coverage (contributed by mdorn, reviewed by Sandro Tosi).

14 years agoFix test_signal on Windows after #12303.
Ross Lagerwall [Sat, 25 Jun 2011 13:03:52 +0000 (15:03 +0200)]
Fix test_signal on Windows after #12303.

14 years agoIssue 11889: Clarify docs for enumerate.
Raymond Hettinger [Sat, 25 Jun 2011 13:00:46 +0000 (15:00 +0200)]
Issue 11889: Clarify docs for enumerate.

14 years agoIssue #12408: Merge.
Mark Dickinson [Sat, 25 Jun 2011 11:29:49 +0000 (13:29 +0200)]
Issue #12408: Merge.

14 years agoIssue #12303: Add sigwaitinfo() and sigtimedwait() to the signal module.
Ross Lagerwall [Sat, 25 Jun 2011 10:13:40 +0000 (12:13 +0200)]
Issue #12303: Add sigwaitinfo() and sigtimedwait() to the signal module.

14 years agoMerge #12228
Mark Dickinson [Sat, 25 Jun 2011 10:04:45 +0000 (12:04 +0200)]
Merge #12228

14 years agomerge
Raymond Hettinger [Sat, 25 Jun 2011 09:52:37 +0000 (11:52 +0200)]
merge

14 years agomerge
Raymond Hettinger [Sat, 25 Jun 2011 09:48:54 +0000 (11:48 +0200)]
merge

14 years agomerge
Raymond Hettinger [Sat, 25 Jun 2011 09:40:20 +0000 (11:40 +0200)]
merge

14 years agoFix typo (reported by Hiro Ashiya).
Raymond Hettinger [Sat, 25 Jun 2011 09:39:42 +0000 (11:39 +0200)]
Fix typo (reported by Hiro Ashiya).

14 years agoMerge with 3.2.
Ezio Melotti [Sat, 25 Jun 2011 09:38:16 +0000 (12:38 +0300)]
Merge with 3.2.

14 years ago#12341: add coverage files/dirs to .hgignore. Patch by Sandro Tosi.
Ezio Melotti [Sat, 25 Jun 2011 09:36:38 +0000 (12:36 +0300)]
#12341: add coverage files/dirs to .hgignore. Patch by Sandro Tosi.

14 years agoCode simplification suggested by Sven Marnach.
Raymond Hettinger [Sat, 25 Jun 2011 09:31:46 +0000 (11:31 +0200)]
Code simplification suggested by Sven Marnach.

14 years agoCode simplification suggested by Sven Marnach.
Raymond Hettinger [Sat, 25 Jun 2011 09:30:53 +0000 (11:30 +0200)]
Code simplification suggested by Sven Marnach.

14 years agoMerge with 3.2 (Issue #12404).
Ross Lagerwall [Sat, 25 Jun 2011 08:11:44 +0000 (10:11 +0200)]
Merge with 3.2 (Issue #12404).

14 years agoIssue 12404: Remove C89 incompatible code from mmap module.
Ross Lagerwall [Sat, 25 Jun 2011 08:02:37 +0000 (10:02 +0200)]
Issue 12404: Remove C89 incompatible code from mmap module.

Patch by Akira Kitada.

14 years agoIssue #12392: fix thread initialization on FreeBSD 6
Victor Stinner [Fri, 24 Jun 2011 18:52:27 +0000 (20:52 +0200)]
Issue #12392: fix thread initialization on FreeBSD 6

On FreeBSD6, pthread_kill() doesn't work on the main thread before the creation
of the first thread. Create therefore a dummy thread (no-op) a startup to
initialize the pthread library.

Add also a test for this use case, test written by Charles-François Natali.

14 years agoMerge #10206: add test for previously fixed bug.
R David Murray [Fri, 24 Jun 2011 17:28:08 +0000 (13:28 -0400)]
Merge #10206: add test for previously fixed bug.

14 years ago#10206: add test for previously fixed bug.
R David Murray [Fri, 24 Jun 2011 17:26:31 +0000 (13:26 -0400)]
#10206: add test for previously fixed bug.

Patch by Francisco Martín Brugué.

14 years agogive the names of missing positional or keyword-only arguments (closes #12356)
Benjamin Peterson [Fri, 24 Jun 2011 14:37:26 +0000 (09:37 -0500)]
give the names of missing positional or keyword-only arguments (closes #12356)

14 years agomerge #9921: clarify os.path.join joining algorithm
R David Murray [Fri, 24 Jun 2011 01:26:48 +0000 (21:26 -0400)]
merge #9921: clarify os.path.join joining algorithm

14 years ago#9921: clarify os.path.join joining algorithm
R David Murray [Fri, 24 Jun 2011 01:26:13 +0000 (21:26 -0400)]
#9921: clarify os.path.join joining algorithm

The new wording is based on the comments in the code, which
match the actual behavior.

14 years ago(null merge 3.2 for issue #11223) python 3.3 has already a better fix
Victor Stinner [Thu, 23 Jun 2011 12:22:59 +0000 (14:22 +0200)]
(null merge 3.2 for issue #11223) python 3.3 has already a better fix

14 years agoIssue #11223: skip also test_rlock_acquire_interruption() on FreeBSD6
Victor Stinner [Thu, 23 Jun 2011 12:22:28 +0000 (14:22 +0200)]
Issue #11223: skip also test_rlock_acquire_interruption() on FreeBSD6

14 years ago(null merge 3.2 for issue #11223) python 3.3 has already a better fix
Victor Stinner [Thu, 23 Jun 2011 09:59:15 +0000 (11:59 +0200)]
(null merge 3.2 for issue #11223) python 3.3 has already a better fix

14 years agoIssue #11223: skip test_lock_acquire_interruption() on FreeBSD6
Victor Stinner [Thu, 23 Jun 2011 09:57:56 +0000 (11:57 +0200)]
Issue #11223: skip test_lock_acquire_interruption() on FreeBSD6

Locks are implemented using a mutex and a condition variable of the pthread
library on FreeBSD6. POSIX condition variables cannot be interrupted by signals
(see pthread_cond_wait manual page).

14 years ago#10354: remove last public mentions of 'template' and comment as private.
R David Murray [Thu, 23 Jun 2011 01:01:13 +0000 (21:01 -0400)]
#10354: remove last public mentions of 'template' and comment as private.

I didn't rename the variable because I can see no good reason
to break backward compatibility just to put an underscore in
the name.

14 years ago(merge 3.2) Issue #12383: skip test_empty_env() of subprocess on Windows
Victor Stinner [Wed, 22 Jun 2011 23:02:50 +0000 (01:02 +0200)]
(merge 3.2) Issue #12383: skip test_empty_env() of subprocess on Windows

Cannot test an empty environment on Windows: Windows requires at least the
SYSTEMROOT environment variable to start Python.

14 years agoIssue #12383: skip test_empty_env() of subprocess on Windows
Victor Stinner [Wed, 22 Jun 2011 23:02:25 +0000 (01:02 +0200)]
Issue #12383: skip test_empty_env() of subprocess on Windows

Cannot test an empty environment on Windows: Windows requires at least the
SYSTEMROOT environment variable to start Python.

14 years agoIssue #12363: improve siginterrupt() tests
Victor Stinner [Wed, 22 Jun 2011 20:15:51 +0000 (22:15 +0200)]
Issue #12363: improve siginterrupt() tests

Add a basic synchronization code between the child and the parent processes:
the child writes "ready" to stdout.

14 years ago(merge 3.2) Issue #12383: fix test_empty_env() of subprocess on Mac OS X
Victor Stinner [Wed, 22 Jun 2011 19:29:07 +0000 (21:29 +0200)]
(merge 3.2) Issue #12383: fix test_empty_env() of subprocess on Mac OS X

Mac OS X adds __CF_USER_TEXT_ENCODING variable to an empty environment. Fix
also the test on the Py_ENABLE_SHARED config varible: test that the variable is
present, don't check it's value.

14 years agoIssue #12383: fix test_empty_env() of subprocess on Mac OS X
Victor Stinner [Wed, 22 Jun 2011 19:28:43 +0000 (21:28 +0200)]
Issue #12383: fix test_empty_env() of subprocess on Mac OS X

Mac OS X adds __CF_USER_TEXT_ENCODING variable to an empty environment. Fix
also the test on the Py_ENABLE_SHARED config varible: test that the variable is
present, don't check it's value.

14 years ago#1874: detect invalid multipart CTE and report it as a defect.
R David Murray [Wed, 22 Jun 2011 17:47:53 +0000 (13:47 -0400)]
#1874: detect invalid multipart CTE and report it as a defect.

14 years ago(merge 3.2) Issue #12383: skip test_empty_env() if compiled is compiled in
Victor Stinner [Tue, 21 Jun 2011 19:59:51 +0000 (21:59 +0200)]
(merge 3.2) Issue #12383: skip test_empty_env() if compiled is compiled in
shared mode

Try also to get more informations about the Mac OS X failure: display the keys
of the environment, instead of just the number of variables.

14 years agoIssue #12383: skip test_empty_env() if compiled is compiled in shared mode
Victor Stinner [Tue, 21 Jun 2011 19:59:06 +0000 (21:59 +0200)]
Issue #12383: skip test_empty_env() if compiled is compiled in shared mode

Try also to get more informations about the Mac OS X failure: display the keys
of the environment, instead of just the number of variables.

14 years ago(merge 3.2) Close #12383: Fix subprocess module with env={}: don't copy the
Victor Stinner [Tue, 21 Jun 2011 15:24:21 +0000 (17:24 +0200)]
(merge 3.2) Close #12383: Fix subprocess module with env={}: don't copy the
environment variables, start with an empty environment.

14 years agoClose #12383: Fix subprocess module with env={}: don't copy the environment
Victor Stinner [Tue, 21 Jun 2011 15:18:38 +0000 (17:18 +0200)]
Close #12383: Fix subprocess module with env={}: don't copy the environment
variables, start with an empty environment.

14 years agomerge 3.2
Benjamin Peterson [Tue, 21 Jun 2011 03:09:20 +0000 (22:09 -0500)]
merge 3.2

14 years agofix indentation
Benjamin Peterson [Tue, 21 Jun 2011 03:09:13 +0000 (22:09 -0500)]
fix indentation

14 years agomerge 3.2
Benjamin Peterson [Tue, 21 Jun 2011 02:40:46 +0000 (21:40 -0500)]
merge 3.2

14 years agomerge heads
Benjamin Peterson [Tue, 21 Jun 2011 02:40:34 +0000 (21:40 -0500)]
merge heads

14 years agofix indentation
Benjamin Peterson [Tue, 21 Jun 2011 02:40:19 +0000 (21:40 -0500)]
fix indentation

14 years agomerge heads
Benjamin Peterson [Tue, 21 Jun 2011 00:24:31 +0000 (19:24 -0500)]
merge heads