ConflictError as a ConflictError.  Replace "is" with "issubclass".

Make SessionDataManagerTraverser inherit from Persistent.  This is in order to avoid a situation in which a nonpersistent instance of this class is inserted into the before traverse hook, causing Zope to not be able to start if the class' containing module can't be imported.  The existence of the bug stemmed from my lack of knowledge about how the traverse hook worked (I didn't know it actually stored an object reference).

(merge from branch)

due to changes in the security machinery

but one of the uses of string.atoi wasn't fixed.  There also wasn't a
test for this. :(

Fixed bug in handling numneric time-zone offsets. We need to subtract,
rather than add the offset, since the offset is the offset of the
local time from UT, not the other way around.

still shouldn't import Zope in unit tests, but most of the existing CMF tests
depend on importing Zope and there was a hidden exception occurring anyway.
(OFS.Application.initialize() was failing.)

Fixed broken ZSearch interface report form. It was broken due to changes in ZPT's non-existent path handling.

with cadaver

fixed for a potential upgrade problem from pre-2.4.2/3 CMF installations

  stemmer support for eleven languages.
- TextIndex code cleanup
- refactoring of the existing TextIndex code

profile stats between runs of the requestprofiler.

Added urlfocus mode.  Urlfocus mode presents a summary of activity
within a period of time before and after the invocation of a particular
URL as it was recorded in the big M log.  This can be useful when trying
to track down a problem which you believe is related to some series
of URL invocations as opposed to a single URL invocation.

Fixed bug in timed mode which effected average stats.

been checked in.