merge back from trunk
authorctheune <ctheune@62d5b8a3-27da-0310-9561-8e5933582275>
Wed, 16 Jun 2010 05:56:22 +0000 (05:56 +0000)
committerctheune <ctheune@62d5b8a3-27da-0310-9561-8e5933582275>
Wed, 16 Jun 2010 05:56:22 +0000 (05:56 +0000)
commit7e898d37f0bce0d4aef41885a4bd141cecb23e07
tree96cf58deee321f5f6fb260b71bfb6a358fb61612
parent57616d62c2e5f1d29b335096bfe3b185b0750f52
merge back from trunk

git-svn-id: svn://svn.zope.org/repos/main/ZODB/branches/zagy-lp509801@113505 62d5b8a3-27da-0310-9561-8e5933582275
src/CHANGES.txt