merge 1.0.x release branch changes

--HG--
branch : trunk

MANIFEST

@@ -1,20 +1,32 @@
-.hgignore
+.hgtags
 CHANGELOG
-LICENSE
 MANIFEST
+doc/announce/release-1.0.0.txt
+doc/download.txt
+doc/test/funcargs.txt
+py/__init__.py
+py/io/stdcapture.py
+py/io/testing/test_stdcapture.py
+py/test/collect.py
+py/test/funcargs.py
+py/test/plugin/pytest_runner.py
+py/test/plugin/pytest_terminal.py
+py/test/pycollect.py
+py/test/testing/test_funcargs.py
+py/test/testing/test_genitems.py
+setup.py
+.hgignore
+LICENSE
 README.txt
-TODO.txt
 _findpy.py
 doc/announce/release-0.9.0.txt
 doc/announce/release-0.9.2.txt
-doc/announce/release-1.0.0.txt
 doc/announce/releases.txt
 doc/bin.txt
 doc/code.txt
 doc/confrest.py
 doc/conftest.py
 doc/contact.txt
-doc/download.txt
 doc/execnet.txt
 doc/img/pylib.png
 doc/index.txt
@@ -29,7 +41,6 @@ doc/test/dist.txt
 doc/test/examples.txt
 doc/test/extend.txt
 doc/test/features.txt
-doc/test/funcargs.txt
 doc/test/quickstart.txt
 doc/test/test.txt
 doc/test/xunit_setup.txt
@@ -59,7 +70,6 @@ example/pytest/test_failures.py
 example/pytest/test_setup_flow_example.py
 ez_setup.py
 py/LICENSE
-py/__init__.py
 py/_com.py
 py/bin/_findpy.py
 py/bin/_genscripts.py
@@ -165,12 +175,10 @@ py/initpkg.py
 py/io/__init__.py
 py/io/dupfile.py
 py/io/fdcapture.py
-py/io/stdcapture.py
 py/io/terminalwriter.py
 py/io/testing/__init__.py
 py/io/testing/test_dupfile.py
 py/io/testing/test_fdcapture.py
-py/io/testing/test_stdcapture.py
 py/io/testing/test_terminalwriter.py
 py/log/__init__.py
 py/log/consumer.py
@@ -285,7 +293,6 @@ py/rest/testing/test_transform.py
 py/rest/transform.py
 py/test/__init__.py
 py/test/cmdline.py
-py/test/collect.py
 py/test/compat.py
 py/test/config.py
 py/test/conftesthandle.py
@@ -300,7 +307,6 @@ py/test/dist/testing/test_mypickle.py
 py/test/dist/testing/test_nodemanage.py
 py/test/dist/testing/test_txnode.py
 py/test/dist/txnode.py
-py/test/funcargs.py
 py/test/looponfail/__init__.py
 py/test/looponfail/remote.py
 py/test/looponfail/testing/__init__.py
@@ -328,14 +334,11 @@ py/test/plugin/pytest_recwarn.py
 py/test/plugin/pytest_restdoc.py
 py/test/plugin/pytest_resultdb.py
 py/test/plugin/pytest_resultlog.py
-py/test/plugin/pytest_runner.py
-py/test/plugin/pytest_terminal.py
 py/test/plugin/pytest_tmpdir.py
 py/test/plugin/pytest_unittest.py
 py/test/plugin/pytest_xfail.py
 py/test/plugin/test_pytest_runner.py
 py/test/pluginmanager.py
-py/test/pycollect.py
 py/test/session.py
 py/test/testing/__init__.py
 py/test/testing/acceptance_test.py
@@ -350,8 +353,6 @@ py/test/testing/test_compat.py
 py/test/testing/test_config.py
 py/test/testing/test_conftesthandle.py
 py/test/testing/test_deprecated_api.py
-py/test/testing/test_funcargs.py
-py/test/testing/test_genitems.py
 py/test/testing/test_outcome.py
 py/test/testing/test_parseopt.py
 py/test/testing/test_pickling.py
@@ -382,5 +383,4 @@ py/xmlobj/testing/__init__.py
 py/xmlobj/testing/test_html.py
 py/xmlobj/testing/test_xml.py
 py/xmlobj/visit.py
-py/xmlobj/xml.py
-setup.py
+py/xmlobj/xml.py