merge tip

author Michael Trier <mtrier@gmail.com>

Mon, 20 Dec 2010 04:17:55 +0000 (23:17 -0500)

committer Michael Trier <mtrier@gmail.com>

Mon, 20 Dec 2010 04:17:55 +0000 (23:17 -0500)
author Michael Trier <mtrier@gmail.com>
Mon, 20 Dec 2010 04:17:55 +0000 (23:17 -0500)
committer Michael Trier <mtrier@gmail.com>
Mon, 20 Dec 2010 04:17:55 +0000 (23:17 -0500)
diff --cc lib/sqlalchemy/dialects/postgresql/psycopg2.py
Simple merge
author	Michael Trier <mtrier@gmail.com>
	Mon, 20 Dec 2010 04:17:55 +0000 (23:17 -0500)
committer	Michael Trier <mtrier@gmail.com>
	Mon, 20 Dec 2010 04:17:55 +0000 (23:17 -0500)