merge tip

diff --cc test/dialect/test_oracle.py
Simple merge

diff --cc test/dialect/test_postgresql.py
Simple merge

diff --cc test/ext/test_declarative.py
Simple merge

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

diff --cc test/orm/test_relationships.py
index eadf17b399c2d774e46c403a712bb95894a77941,03efa01832f1b6cb0d20dcafcc6709de5c9cb813..9cd99320aa9d53ac0ad1e7fd2e1a51d09193eaa3
--- 1/test/orm/test_relationships.py
--- 2/test/orm/test_relationships.py
+++ b/test/orm/test_relationships.py
@@@ -1,12 -1,14 +1,14 @@@
 -from sqlalchemy.test.testing import assert_raises, assert_raises_message
 +from test.lib.testing import assert_raises, assert_raises_message
  import datetime
  import sqlalchemy as sa
 -from sqlalchemy.test import testing
 +from test.lib import testing
  from sqlalchemy import Integer, String, ForeignKey, MetaData, and_
 -from sqlalchemy.test.schema import Table, Column
 +from test.lib.schema import Table, Column
  from sqlalchemy.orm import mapper, relationship, relation, \
-                     backref, create_session, compile_mappers, clear_mappers, sessionmaker
+                     backref, create_session, compile_mappers, \
+                     clear_mappers, sessionmaker, attributes,\
+                     Session, composite, column_property
 -from sqlalchemy.test.testing import eq_, startswith_
 +from test.lib.testing import eq_, startswith_
  from test.orm import _base, _fixtures