Merge branch 'pr204'

diff --cc doc/build/changelog/changelog_11.rst
index dcd43f28d67c7730336aa29442565ebe7d699463,e296be0e2e301bd02b427a4769f502461fe1abdb..688818a2a3b5d1f34e77b264ab9687cb642b333c
--- 1/doc/build/changelog/changelog_11.rst
--- 2/doc/build/changelog/changelog_11.rst
+++ b/doc/build/changelog/changelog_11.rst
@@@ -21,57 -21,16 +21,67 @@@
  .. changelog::
      :version: 1.1.0b1
  
+     .. change::
+         :tags: enhancement, schema
+         :pullreq: github:204
+ 
+         The default generation functions passed to :class:`.Column` objects
+         are now run through "update_wrapper", or an equivalent function
+         if a callable non-function is passed, so that introspection tools
+         preserve the name and docstring of the wrapped function.  Pull
+         request courtesy hsum.
+ 
 +    .. change::
 +        :tags: change, sql, mysql
 +        :tickets: 3216
 +
 +        The system by which a :class:`.Column` considers itself to be an
 +        "auto increment" column has been changed, such that autoincrement
 +        is no longer implicitly enabled for a :class:`.Table` that has a
 +        composite primary key.  In order to accommodate being able to enable
 +        autoincrement for a composite PK member column while at the same time
 +        maintaining SQLAlchemy's long standing behavior of enabling
 +        implicit autoincrement for a single integer primary key, a third
 +        state has been added to the :paramref:`.Column.autoincrement` parameter
 +        ``"auto"``, which is now the default.
 +
 +        .. seealso::
 +
 +            :ref:`change_3216`
 +
 +            :ref:`change_mysql_3216`
 +
 +    .. change::
 +        :tags: change, mysql
 +        :tickets: 3216
 +
 +        The MySQL dialect no longer generates an extra "KEY" directive when
 +        generating CREATE TABLE DDL for a table using InnoDB with a
 +        composite primary key with AUTO_INCREMENT on a column that isn't the
 +        first column;  to overcome InnoDB's limitation here, the PRIMARY KEY
 +        constraint is now generated with the AUTO_INCREMENT column placed
 +        first in the list of columns.
 +
 +        .. seealso::
 +
 +            :ref:`change_mysql_3216`
 +
 +            :ref:`change_3216`
 +
 +    .. change::
 +        :tags: change, sqlite
 +        :pullreq: github:198
 +
 +        Added support to the SQLite dialect for the
 +        :meth:`.Inspector.get_schema_names` method to work with SQLite;
 +        pull request courtesy Brian Van Klaveren.  Also repaired support
 +        for creation of indexes with schemas as well as reflection of
 +        foreign key constraints in schema-bound tables.
 +
 +        .. seealso::
 +
 +            :ref:`change_sqlite_schemas`
 +
      .. change::
          :tags: change, mssql
          :tickets: 3434

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

diff --cc test/sql/test_defaults.py
Simple merge