[Checkins] SVN: zope.event/branches/tseaver-new_style_docs/ Merge from trunk.

[Tres Seaver]

Log message for revision 111846:
  Merge from trunk.

Changed:
  _U  zope.event/branches/tseaver-new_style_docs/
  U   zope.event/branches/tseaver-new_style_docs/CHANGES.txt
  U   zope.event/branches/tseaver-new_style_docs/setup.py

-=-

Property changes on: zope.event/branches/tseaver-new_style_docs
___________________________________________________________________
Modified: svn:mergeinfo
   - /zope.event/trunk:111055

   + /zope.event/trunk:111055,111827-111828,111830

Modified: svk:merge
   - 62d5b8a3-27da-0310-9561-8e5933582275:/zope.event/trunk:111055

   + 62d5b8a3-27da-0310-9561-8e5933582275:/zope.event/trunk:111055
62d5b8a3-27da-0310-9561-8e5933582275:/zope.event/trunk:111830


Modified: zope.event/branches/tseaver-new_style_docs/CHANGES.txt
===================================================================
--- zope.event/branches/tseaver-new_style_docs/CHANGES.txt	2010-05-01 17:24:21 UTC (rev 111845)
+++ zope.event/branches/tseaver-new_style_docs/CHANGES.txt	2010-05-01 17:26:03 UTC (rev 111846)
@@ -1,7 +1,7 @@
 CHANGES
 =======
 
-3.4.2 (unreleased)
+3.5.0 (2010-05-01)
 ------------------
 
 - Added change log to ``long_description``.

Modified: zope.event/branches/tseaver-new_style_docs/setup.py
===================================================================
--- zope.event/branches/tseaver-new_style_docs/setup.py	2010-05-01 17:24:21 UTC (rev 111845)
+++ zope.event/branches/tseaver-new_style_docs/setup.py	2010-05-01 17:26:03 UTC (rev 111846)
@@ -38,7 +38,7 @@
 
 setup(
     name='zope.event',
-    version='3.4.2dev',
+    version='3.5.1dev',
     url='http://pypi.python.org/pypi/zope.event',
     license='ZPL 2.1',
     description='Very basic event publishing system',
@@ -57,6 +57,7 @@
         "Programming Language :: Python :: 2.4",
         "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 3",
         "Programming Language :: Python :: 3.1",
         "Topic :: Software Development :: Libraries :: Python Modules",
         ],