bring in shape

CHANGES.txt

@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+3.11.2 (unreleased)
+-------------------
+
+- ...
+
+
 3.11.1 (2010-04-30)
 -------------------
 
@@ -55,7 +61,7 @@ CHANGES
 
 - Previous releases should be versioned 3.9.0 as they are not pure bugfix
   releases and worth a "feature" release, increasing feature version.
-  
+
   Packages that depend on any changes introduced in version 3.8.2 or 3.8.3
   should depend on version 3.9 or greater.
 
@@ -115,7 +121,7 @@ CHANGES
 3.7.2 (2009-03-12)
 ------------------
 
-- Fix: added missing ComponentLookupError, missing since revision 95429 and 
+- Fix: added missing ComponentLookupError, missing since revision 95429 and
   missing in last release.
 
 - Adapt to the move of IDefaultViewName from zope.component.interfaces

setup.py

@@ -16,18 +16,18 @@
 # When developing and releasing this package, please follow the documented
 # Zope Toolkit policies as described by this documentation.
 ##############################################################################
-"""Setup for zope.container package
+"""Setup for zope.container package"""
 
-$Id$
-"""
 import os
 from setuptools import setup, find_packages, Extension
 
+
 def read(*rnames):
     return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
 
+
 setup(name='zope.container',
-      version = '3.11.1',
+      version = '3.11.2dev',
       author='Zope Corporation and Contributors',
       author_email='zope-dev@zope.org',
       description='Zope Container',