Update of /cvs-repository/Zope2/doc In directory korak.digicool.com:/home/brian/temp/mi-merge/doc Modified Files: CHANGES.txt HISTORY.txt Log Message: reconciled CHANGES and HISTORY before 2.3 branch