Merge branch 'rel_0_9'

Conflicts:
	lib/sqlalchemy/dialects/postgresql/hstore.py
	lib/sqlalchemy/util/__init__.py
	lib/sqlalchemy/util/compat.py

diff --cc lib/sqlalchemy/dialects/postgresql/hstore.py
Simple merge

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

diff --cc lib/sqlalchemy/util/compat.py
index 6905d6347c2f71f7c709064e024e3f076edbf347,182ab1c3d08db47f6d0b032482293e1c12132409..3bbce5ddebfb886956b558a59b77fce95a27d493
--- 1/lib/sqlalchemy/util/compat.py
--- 2/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@@ -14,9 -14,8 +14,8 @@@ except ImportError
      import dummy_threading as threading
  
  py32 = sys.version_info >= (3, 2)
- py3k_warning = getattr(sys, 'py3kwarning', False) or sys.version_info >= (3, 0)
  py3k = sys.version_info >= (3, 0)
 -py2k = not py3k
 +py2k = sys.version_info < (3, 0)
  jython = sys.platform.startswith('java')
  pypy = hasattr(sys, 'pypy_version_info')
  win32 = sys.platform.startswith('win')