merge tip

diff --cc lib/sqlalchemy/engine/base.py
Simple merge

diff --cc lib/sqlalchemy/orm/attributes.py
Simple merge

diff --cc lib/sqlalchemy/orm/interfaces.py
Simple merge

diff --cc lib/sqlalchemy/orm/mapper.py
index d1fb47e23e9dbb9bfaec6626903e843339ef9d0b,378570723b3e6c0ff026f706e82d0cff5840b2f9..b3aa7fb29497cf9cb07b66603e62dfa0bd82b279
--- 1/lib/sqlalchemy/orm/mapper.py
--- 2/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@@ -20,16 -20,17 +20,18 @@@ import operato
  from itertools import chain, groupby
  deque = __import__('collections').deque
  
 -from sqlalchemy import sql, util, log, exc as sa_exc
 +from sqlalchemy import sql, util, log, exc as sa_exc, event
- from sqlalchemy.sql import expression, visitors, operators, \
-     util as sqlutil
- from sqlalchemy.orm import instrumentation, sync, exc as orm_exc, \
-     unitofwork, attributes
- from sqlalchemy.orm.interfaces import MapperProperty, EXT_CONTINUE, \
-     PropComparator
- from sqlalchemy.orm.util import ExtensionCarrier, _INSTRUMENTOR, \
-     _class_to_mapper, _state_mapper, class_mapper, instance_str, \
-     state_str
+ from sqlalchemy.sql import expression, visitors, operators, util as sqlutil
 -from sqlalchemy.orm import attributes, sync, exc as orm_exc, unitofwork
++from sqlalchemy.orm import instrumentation, attributes, sync, \
++                        exc as orm_exc, unitofwork
+ from sqlalchemy.orm.interfaces import (
+     MapperProperty, EXT_CONTINUE, PropComparator
+     )
+ from sqlalchemy.orm.util import (
+      ExtensionCarrier, _INSTRUMENTOR, _class_to_mapper, 
+      _state_mapper, class_mapper, instance_str, state_str,
+      )
+ import sys
  
  __all__ = (
      'Mapper',

diff --cc lib/sqlalchemy/schema.py
Simple merge

diff --cc lib/sqlalchemy/util.py
Simple merge

diff --cc test/engine/test_execute.py
Simple merge

diff --cc test/engine/test_pool.py
Simple merge

diff --cc test/orm/test_mapper.py
Simple merge