- merge tip

diff --cc examples/custom_attributes/custom_management.py
index 03d38c26aa3485f16b9a36cd92041fb2d4673c96,34481b623502735eb64e968578144520095d48d8..2e2689140cef5ef56c5330f110679c1628bc78fe
--- 1/examples/custom_attributes/custom_management.py
--- 2/examples/custom_attributes/custom_management.py
+++ b/examples/custom_attributes/custom_management.py
@@@ -1,21 -1,24 +1,25 @@@
- """this example illustrates how to replace SQLAlchemy's class descriptors with a user-defined system.
+ """this example illustrates how to replace SQLAlchemy's class descriptors with
+ a user-defined system.
  
- This sort of thing is appropriate for integration with frameworks that redefine class behaviors
- in their own way, such that SQLA's default instrumentation is not compatible.   
+ This sort of thing is appropriate for integration with frameworks that
+ redefine class behaviors in their own way, such that SQLA's default
+ instrumentation is not compatible.
  
- The example illustrates redefinition of instrumentation at the class level as well as the collection
- level, and redefines the storage of the class to store state within "instance._goofy_dict" instead
- of "instance.__dict__".  Note that the default collection implementations can be used 
- with a custom attribute system as well.
+ The example illustrates redefinition of instrumentation at the class level as
+ well as the collection level, and redefines the storage of the class to store
+ state within "instance._goofy_dict" instead of "instance.__dict__". Note that
+ the default collection implementations can be used with a custom attribute
+ system as well.
  
  """
- from sqlalchemy import (create_engine, MetaData, Table, Column, Integer, Text,
-     ForeignKey)
- from sqlalchemy.orm import (mapper, relationship, create_session,
-     InstrumentationManager)
+ from sqlalchemy import create_engine, MetaData, Table, Column, Integer, Text,\
+     ForeignKey
+ from sqlalchemy.orm import mapper, relationship, Session,\
+     InstrumentationManager
  
- from sqlalchemy.orm.attributes import set_attribute, get_attribute, del_attribute
+ from sqlalchemy.orm.attributes import set_attribute, get_attribute, \
 -                                del_attribute, is_instrumented
++    del_attribute
 +from sqlalchemy.orm.instrumentation import is_instrumented
  from sqlalchemy.orm.collections import collection_adapter
  
  

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

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

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

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

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

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

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

diff --cc lib/sqlalchemy/test/engines.py
index 8b930175fe3a08af561c62ab0a811edae4f66fb1,870f984ecfdddf0b09b58d958df0ee54804ad5dc..acae1d28a643f2437e9d0887d9e97d7070c261e9
--- 1/lib/sqlalchemy/test/engines.py
--- 2/lib/sqlalchemy/test/engines.py
+++ b/lib/sqlalchemy/test/engines.py
@@@ -1,8 -1,7 +1,8 @@@
  import sys, types, weakref
  from collections import deque
- import config
+ from sqlalchemy_nose import config
  from sqlalchemy.util import function_named, callable
 +from sqlalchemy import event
  import re
  import warnings
  

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

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