summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Blocked revisions 80259 via svnmergeEzio Melotti2010-04-200-0/+0
| | | | | | | | ........ r80259 | ezio.melotti | 2010-04-20 13:57:44 +0300 (Tue, 20 Apr 2010) | 1 line Fix two versionchanged. ........
* Merged revisions 80256 via svnmerge fromSenthil Kumaran2010-04-201-6/+18
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80256 | senthil.kumaran | 2010-04-20 16:05:49 +0530 (Tue, 20 Apr 2010) | 9 lines Merged revisions 80236 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80236 | senthil.kumaran | 2010-04-20 12:24:59 +0530 (Tue, 20 Apr 2010) | 3 lines Fix Issue8460: Victor's patch to add timeout in test_urllib2net test_urls. ........ ................
* Merged revisions 80207 via svnmerge fromEzio Melotti2010-04-201-1/+1
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80207 | sean.reifschneider | 2010-04-19 09:06:12 +0300 (Mon, 19 Apr 2010) | 2 lines I'll maintain syslog. I've made most of the "recent" changes to it anyway. ........
* Blocked revisions 80251 via svnmergeEzio Melotti2010-04-200-0/+0
| | | | | | | | ........ r80251 | ezio.melotti | 2010-04-20 12:41:59 +0300 (Tue, 20 Apr 2010) | 1 line Update the python version in the interpreter tutorial. ........
* Add a missing versionadded in unittest.rst.Ezio Melotti2010-04-201-0/+2
|
* Blocked revisions 80248 via svnmergeEzio Melotti2010-04-200-0/+0
| | | | | | | | ........ r80248 | ezio.melotti | 2010-04-20 12:32:54 +0300 (Tue, 20 Apr 2010) | 1 line Fix versionadded in unittest.rst. ........
* Blocked revisions 80246 via svnmergeTarek Ziadé2010-04-200-0/+0
| | | | | | | | ........ r80246 | tarek.ziade | 2010-04-20 11:13:23 +0200 (Tue, 20 Apr 2010) | 1 line added a note on shutil.copytree improvements ........
* Blocked revisions 80244 via svnmergeTarek Ziadé2010-04-200-0/+0
| | | | | | | | ........ r80244 | tarek.ziade | 2010-04-20 10:57:33 +0200 (Tue, 20 Apr 2010) | 1 line Fixed #6547: Added the ignore_dangling_symlinks option to shutil.copytree ........
* Merged revisions 80240 via svnmerge fromStefan Krah2010-04-201-8/+10
| | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80240 | stefan.krah | 2010-04-20 10:13:03 +0200 (Tue, 20 Apr 2010) | 15 lines Merged revisions 80238 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80238 | stefan.krah | 2010-04-20 09:59:10 +0200 (Tue, 20 Apr 2010) | 9 lines 1) The timeout in the itimer tests was too low for slow or heavily loaded machines. 2) Even with the increased timeout, the OS does not guarantee that a process will get a certain amount of virtual time in 60s, so the failure is changed to a diagnostic. ........ ................
* Merged revisions 80233 via svnmerge fromRonald Oussoren2010-04-201-0/+3
| | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80233 | ronald.oussoren | 2010-04-20 08:36:47 +0200 (Tue, 20 Apr 2010) | 10 lines Merged revisions 80232 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80232 | ronald.oussoren | 2010-04-20 07:50:44 +0200 (Tue, 20 Apr 2010) | 3 lines Explicitly set system default for $PATH to ensure we have a clean build environment (OSX installer) ........ ................
* Blocked revisions 80230 via svnmergeTarek Ziadé2010-04-190-0/+0
| | | | | | | | ........ r80230 | tarek.ziade | 2010-04-20 00:30:51 +0200 (Tue, 20 Apr 2010) | 1 line Fixed #1540112: now shutil.copytree will let you provide your own copy() function ........
* Merged revisions 80228 via svnmerge fromGiampaolo Rodolà2010-04-192-0/+7
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80228 | giampaolo.rodola | 2010-04-20 00:05:54 +0200 (mar, 20 apr 2010) | 9 lines Merged revisions 80226 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80226 | giampaolo.rodola | 2010-04-19 23:46:28 +0200 (lun, 19 apr 2010) | 1 line Fix Issue #4841: timeout is now applied for connections resulting from PORT/EPRT commands ........ ................
* Blocked revisions 80224 via svnmergeTarek Ziadé2010-04-190-0/+0
| | | | | | | | | | | | | | | ................ r80224 | tarek.ziade | 2010-04-19 23:31:42 +0200 (Mon, 19 Apr 2010) | 9 lines Merged revisions 80221 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80221 | tarek.ziade | 2010-04-19 23:28:21 +0200 (Mon, 19 Apr 2010) | 1 line Fixed #8463: added missing reference to bztar in shutil's documentation. ........ ................
* Blocked revisions 80219 via svnmergeTarek Ziadé2010-04-190-0/+0
| | | | | | | | | | | | | | | ................ r80219 | tarek.ziade | 2010-04-19 23:19:57 +0200 (Mon, 19 Apr 2010) | 9 lines Merged revisions 80218 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80218 | tarek.ziade | 2010-04-19 23:13:03 +0200 (Mon, 19 Apr 2010) | 1 line few pep8 fixes ........ ................
* Issue 8436: set.__init__ accepts keyword argsRaymond Hettinger2010-04-182-0/+3
|
* Fix for issue #5652Ronald Oussoren2010-04-181-10/+0
|
* Merged revisions 80198 via svnmerge fromRonald Oussoren2010-04-184-27/+335
| | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80198 | ronald.oussoren | 2010-04-18 22:46:11 +0200 (Sun, 18 Apr 2010) | 4 lines For for issue #7154: Port the code that uses the SystemConfiguration framework to detect the proxy settings on OSX from the trunk to python 3.2 ........
* Issue 8420: Fix ref counting problem in set_repr().Raymond Hettinger2010-04-181-3/+1
|
* Merged revisions 80191 via svnmerge fromRonald Oussoren2010-04-182-24/+58
| | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80191 | ronald.oussoren | 2010-04-18 21:07:43 +0200 (Sun, 18 Apr 2010) | 13 lines Merged revisions 80187 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80187 | ronald.oussoren | 2010-04-18 19:59:37 +0200 (Sun, 18 Apr 2010) | 6 lines Add the OSX universal binary related options to CFLAGS instead of BASECFLAGS. This fixes issue 8366 and is needed due to changes introduced in the fix for issue 1628484. ........ ................
* Merged revisions 80185 via svnmerge fromRonald Oussoren2010-04-181-0/+51
| | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80185 | ronald.oussoren | 2010-04-18 17:24:17 +0200 (Sun, 18 Apr 2010) | 12 lines Merged revisions 80179 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80179 | ronald.oussoren | 2010-04-18 16:01:05 +0200 (Sun, 18 Apr 2010) | 5 lines Add check to build-installer.py to ensure that the right version of Tcl/Tk is available (on OSX) Fixes issue #5651 ........ ................
* Merged revisions 80182 via svnmerge fromRonald Oussoren2010-04-183-2/+21
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80182 | ronald.oussoren | 2010-04-18 17:02:38 +0200 (Sun, 18 Apr 2010) | 9 lines Merged revisions 80178 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80178 | ronald.oussoren | 2010-04-18 15:47:49 +0200 (Sun, 18 Apr 2010) | 2 lines Fix for issue #7072 ........ ................
* Recorded merge of revisions 80176 via svnmerge fromGiampaolo Rodolà2010-04-180-0/+0
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80176 | giampaolo.rodola | 2010-04-18 15:36:35 +0200 (dom, 18 apr 2010) | 9 lines Merged revisions 80172 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80172 | giampaolo.rodola | 2010-04-18 14:55:03 +0200 (dom, 18 apr 2010) | 1 line Fix Issue #3817: 225 is now considered a valid response code for ABOR ........ ................
* Fix Issue #3817: 225 is now considered a valid response code for ABORGiampaolo Rodolà2010-04-182-1/+4
|
* Blocked revisions 80163 via svnmergeVictor Stinner2010-04-180-0/+0
| | | | | | | | | | ........ r80163 | victor.stinner | 2010-04-18 10:23:42 +0200 (dim., 18 avril 2010) | 4 lines Issue #8422, test_genericpath: skip the creation of a directory with an invalid UTF name on Mac OS X because the OS deny it (the name have to be a valid UTF8 string). ........
* Blocked revisions 80161 via svnmergeVictor Stinner2010-04-180-0/+0
| | | | | | | | | | ........ r80161 | victor.stinner | 2010-04-18 09:59:53 +0200 (dim., 18 avril 2010) | 4 lines Issue #8340, test_abs_path() of test_site: encode paths to ASCII with backslashreplace to avoid locale issues, don't write stderr to a pipe to ease debug, separate directories by newlines instead of a space. ........
* Merged revisions 80159 via svnmerge fromVictor Stinner2010-04-182-3/+19
| | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80159 | victor.stinner | 2010-04-18 02:00:44 +0200 (dim., 18 avril 2010) | 3 lines Issue #8394: _ctypes.dlopen() accepts bytes, bytearray and str with surrogates. ........
* Merged revisions 80148 via svnmerge fromSenthil Kumaran2010-04-171-2/+24
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80148 | senthil.kumaran | 2010-04-17 20:14:14 +0530 (Sat, 17 Apr 2010) | 9 lines Merged revisions 80146 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80146 | senthil.kumaran | 2010-04-17 20:00:53 +0530 (Sat, 17 Apr 2010) | 3 lines Fix Issue5650 - Update the RFC List in the urlparse module. ........ ................
* Blocked revisions 80135 via svnmergeVictor Stinner2010-04-160-0/+0
| | | | | | | | | | | ........ r80135 | victor.stinner | 2010-04-17 01:49:32 +0200 (sam., 17 avril 2010) | 5 lines Issue #8393: subprocess accepts bytes, bytearray and str with surrogates for the current working directory. Remove also a trailing space, and replace tabulation indentation by spaces. ........
* Merged revisions 79957 via svnmerge fromBenjamin Peterson2010-04-161-0/+1
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r79957 | benjamin.peterson | 2010-04-11 11:13:23 -0500 (Sun, 11 Apr 2010) | 1 line add 3.1.2 ........
* Merged revisions 80125,80128,80130 via svnmerge fromBenjamin Peterson2010-04-164-20/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80125 | benjamin.peterson | 2010-04-16 17:35:32 -0500 (Fri, 16 Apr 2010) | 13 lines Merged revisions 80123-80124 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80123 | benjamin.peterson | 2010-04-16 17:24:16 -0500 (Fri, 16 Apr 2010) | 1 line bytearray -> type2test ........ r80124 | benjamin.peterson | 2010-04-16 17:25:57 -0500 (Fri, 16 Apr 2010) | 1 line fix typo ........ ................ r80128 | benjamin.peterson | 2010-04-16 17:51:37 -0500 (Fri, 16 Apr 2010) | 9 lines Merged revisions 80126 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80126 | benjamin.peterson | 2010-04-16 17:35:38 -0500 (Fri, 16 Apr 2010) | 1 line have a clear error when passing something > sys.maxsize to bytearray ........ ................ r80130 | benjamin.peterson | 2010-04-16 18:00:53 -0500 (Fri, 16 Apr 2010) | 9 lines Merged revisions 80129 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80129 | benjamin.peterson | 2010-04-16 17:52:44 -0500 (Fri, 16 Apr 2010) | 1 line tiny simplification ........ ................
* Merged revisions 80108,80111,80114-80115 via svnmerge fromMark Dickinson2010-04-162-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80108 | victor.stinner | 2010-04-16 13:23:43 +0100 (Fri, 16 Apr 2010) | 4 lines Add CS_GNU_LIBC_VERSION and CS_GNU_LIBPTHREAD_VERSION constants for constr(), and disable test_execvpe_with_bad_program() of test_os if the libc uses linuxthreads to avoid the "unknown signal 32" bug (see issue #4970). ........ r80111 | mark.dickinson | 2010-04-16 13:47:52 +0100 (Fri, 16 Apr 2010) | 1 line Keep confstr entries in alphabetical order. ........ r80114 | mark.dickinson | 2010-04-16 14:45:35 +0100 (Fri, 16 Apr 2010) | 1 line Issue #4970: move linuxthreads check outside the affected test, and use skipIf ........ r80115 | mark.dickinson | 2010-04-16 14:51:27 +0100 (Fri, 16 Apr 2010) | 1 line Don't assume that os.confstr_names exists. ........
* Merged revisions 80112 via svnmerge fromVictor Stinner2010-04-162-1/+6
| | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80112 | victor.stinner | 2010-04-16 15:28:05 +0200 (ven., 16 avril 2010) | 3 lines Issue #7606: XML-RPC traceback stored in X-traceback is now encoded to ASCII using backslashreplace error handler. ........
* Merged revisions 80116 via svnmerge fromVictor Stinner2010-04-161-1/+9
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80116 | victor.stinner | 2010-04-16 17:10:27 +0200 (ven., 16 avril 2010) | 2 lines Issue #7605: Fix test_cmd_line if the current working directory is not ASCII ........
* Merged revisions 75538,75542,77012,77928,79113,79999,80109 via svnmerge fromR. David Murray2010-04-161-22/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r75538 | kurt.kaiser | 2009-10-19 15:39:00 -0400 (Mon, 19 Oct 2009) | 2 lines add myself to idlelib ........ r75542 | raymond.hettinger | 2009-10-19 15:52:20 -0400 (Mon, 19 Oct 2009) | 1 line Add maintainers. ........ r77012 | ezio.melotti | 2009-12-23 15:56:09 -0500 (Wed, 23 Dec 2009) | 1 line Rephrased the introduction, added missing commas and my name for Unicode ........ r77928 | tarek.ziade | 2010-02-02 18:31:01 -0500 (Tue, 02 Feb 2010) | 1 line added myself as the maintainer for sysconfig and shutil ........ r79113 | benjamin.peterson | 2010-03-19 17:01:27 -0400 (Fri, 19 Mar 2010) | 1 line make maintainers.rst have correct eol ........ r79999 | r.david.murray | 2010-04-12 11:19:03 -0400 (Mon, 12 Apr 2010) | 4 lines Kurt's roundup id is kbk, use that in maintainers.rst instead of his checkin id, since maintainers is for finding people to make nosy in the tracker. ........ r80109 | r.david.murray | 2010-04-16 08:34:45 -0400 (Fri, 16 Apr 2010) | 5 lines maintainers.rst additions. Add Giampaolo Rodola as an expert for ftplib, and Victor Stinner to the 'unicode' interest area. ........
* Merged revisions 80105 via svnmerge fromVictor Stinner2010-04-162-6/+14
| | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80105 | victor.stinner | 2010-04-16 13:45:13 +0200 (ven., 16 avril 2010) | 3 lines Issue #8412: os.system() now accepts bytes, bytearray and str with surrogates. ........
* Blocked revisions 80106 via svnmergeVictor Stinner2010-04-160-0/+0
| | | | | | | | | | | | | | | | | ................ r80106 | victor.stinner | 2010-04-16 14:07:30 +0200 (ven., 16 avril 2010) | 9 lines Merged revisions 79892 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79892 | martin.v.loewis | 2010-04-07 13:01:46 +0200 (mer., 07 avril 2010) | 2 lines Issue #8314: Fix unsigned long long bug in libffi on Sparc v8. ........ ................ python 3.1 doesn't have the new libffi 3.0.9 (it uses libffi 3.0.5).
* Reverting the previous checkin (80103). The feature should not have been ↵Senthil Kumaran2010-04-163-57/+12
| | | | merged to 3.1 maint.
* Merged revisions 80102 via svnmerge fromSenthil Kumaran2010-04-163-12/+57
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80102 | senthil.kumaran | 2010-04-16 08:32:13 +0530 (Fri, 16 Apr 2010) | 9 lines Merged revisions 80101 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80101 | senthil.kumaran | 2010-04-16 08:16:46 +0530 (Fri, 16 Apr 2010) | 3 lines Fix issue2987: RFC2732 support for urlparse (IPv6 addresses) ........ ................
* Merged revisions 80092 via svnmerge fromSenthil Kumaran2010-04-151-9/+25
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80092 | senthil.kumaran | 2010-04-15 22:48:22 +0530 (Thu, 15 Apr 2010) | 2 lines Fix Issue5419 - explaining bytes return value of urlopen, use of .decode() to convert to str. ........
* Merged revisions 80078 via svnmerge fromR. David Murray2010-04-144-1/+13
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80078 | r.david.murray | 2010-04-14 14:59:18 -0400 (Wed, 14 Apr 2010) | 9 lines Merged revisions 80062 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80062 | r.david.murray | 2010-04-13 16:57:40 -0400 (Tue, 13 Apr 2010) | 2 lines Issue #5277: Fix quote counting when parsing RFC 2231 encoded parameters. ........ ................
* Fixed extraneous _winreg (changed to winreg in py3k). Thanks, Tim Golden.Brian Curtin2010-04-131-1/+1
|
* Merged revisions 80040 via svnmerge fromMark Dickinson2010-04-131-1/+1
| | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80040 | mark.dickinson | 2010-04-13 12:54:59 +0100 (Tue, 13 Apr 2010) | 1 line Fix invalid syntax. ........
* Merged revisions 80036 via svnmerge fromMark Dickinson2010-04-131-1/+1
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80036 | mark.dickinson | 2010-04-13 12:43:10 +0100 (Tue, 13 Apr 2010) | 9 lines Merged revisions 80035 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80035 | mark.dickinson | 2010-04-13 12:37:23 +0100 (Tue, 13 Apr 2010) | 1 line In test_winsound, don't try to import _winreg until after checking that winsound is supported. ........ ................
* Merged revisions 80031 via svnmerge fromVictor Stinner2010-04-135-6/+14
| | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r80031 | victor.stinner | 2010-04-13 13:07:24 +0200 (mar., 13 avril 2010) | 4 lines Issue #8383: pickle and pickletools use surrogatepass error handler when encoding unicode as utf8 to support lone surrogates and stay compatible with Python 2.x and 3.0 ........
* Merged revisions 80027 via svnmerge fromBrian Curtin2010-04-131-0/+21
| | | | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80027 | brian.curtin | 2010-04-12 21:32:40 -0500 (Mon, 12 Apr 2010) | 11 lines Merged revisions 80026 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80026 | brian.curtin | 2010-04-12 21:25:20 -0500 (Mon, 12 Apr 2010) | 4 lines Fix #7306. Add skips to test_winsound when no default sound is configured. These failures occur on a Windows Server 2003 machine I test on. ........ ................
* Add usage notes for collections.Counter()Raymond Hettinger2010-04-121-0/+27
|
* More NaN consistency fixes (manual merge of r79875 to release31-maint).Mark Dickinson2010-04-121-3/+3
|
* Blocked revisions 80006 via svnmergeR. David Murray2010-04-120-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | ................ r80006 | r.david.murray | 2010-04-12 12:58:02 -0400 (Mon, 12 Apr 2010) | 19 lines Merged revisions 80004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80004 | r.david.murray | 2010-04-12 12:35:19 -0400 (Mon, 12 Apr 2010) | 13 lines Issue #7585: use tab between components in unified and context diff headers. Instead of spaces between the filename and date (or whatever the string is that follows the filename, if any) use tabs. This is what the unix 'diff' command does, for example, and difflib was intended to follow the 'standard' way of doing diffs. This improves compatibility with patch tools. The docs and examples are also changed to recommended that the date format used be the ISO 8601 format, which is what modern diff tools emit by default. Patch by Anatoly Techtonik. ........ ................
* Merged revisions 80002 via svnmerge fromStefan Krah2010-04-121-5/+3
| | | | | | | | | | | | | | | | | svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80002 | stefan.krah | 2010-04-12 17:33:12 +0200 (Mon, 12 Apr 2010) | 9 lines Merged revisions 80000 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80000 | stefan.krah | 2010-04-12 17:21:25 +0200 (Mon, 12 Apr 2010) | 3 lines Issue #8367: Fix spurious test failure on systems without a sound card. ........ ................
* typoBarry Warsaw2010-04-121-1/+1
|