merge

diff --cc setup.py
index f38f3759f9d8796d4622a99fcb90913a6fd857f9,723b05a2cef5a6d3bbfa2bd71336c164e9912887..3b64bc7f7b54572e7ea5e4f2b29df81250c2c4e5
--- 1/setup.py
--- 2/setup.py
+++ b/setup.py
@@@ -117,12 -117,9 +117,9 @@@ SQLAlchemy's Advantages
      * Data mapping can be used in a row-based manner. Any bizarre hyper-optimized query that you or your DBA can cook up, you can run in SQLAlchemy, and as long as it returns the expected columns within a rowset, you can get your objects from it. For a rowset that contains more than one kind of object per row, multiple mappers can be chained together to return multiple object instance lists from a single database round trip.
      * The type system allows pre- and post- processing of data, both at the bind parameter and the result set level. User-defined types can be freely mixed with built-in types. Generic types as well as SQL-specific types are available.
  
- SVN version:
- <http://svn.sqlalchemy.org/sqlalchemy/trunk#egg=SQLAlchemy-dev>
- 
  """,
        classifiers = [
 -        "Development Status :: 4 - Beta",
 +        "Development Status :: 5 - Production/Stable",
          "Intended Audience :: Developers",
          "License :: OSI Approved :: MIT License",
          "Programming Language :: Python",