Merge branch 'rel_0_9'

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

1 files changed, 9 insertions, 9 deletions

diff --git a/lib/sqlalchemy/sql/functions.py b/lib/sqlalchemy/sql/functions.py
index c1c07dfb6..244505bed 100644
--- a/lib/sqlalchemy/sql/functions.py
+++ b/lib/sqlalchemy/sql/functions.py
@@ -31,17 +31,18 @@ def register_function(identifier, fn, package="_default"):
 
 class _GenericMeta(VisitableType):
     def __init__(cls, clsname, bases, clsdict):
-        cls.name = name = clsdict.get('name', clsname)
-        cls.identifier = identifier = clsdict.get('identifier', name)
-        package = clsdict.pop('package', '_default')
-        # legacy
-        if '__return_type__' in clsdict:
-            cls.type = clsdict['__return_type__']
-        register_function(identifier, cls, package)
+        if clsname != 'MetaBase':
+            cls.name = name = clsdict.get('name', clsname)
+            cls.identifier = identifier = clsdict.get('identifier', name)
+            package = clsdict.pop('package', '_default')
+            # legacy
+            if '__return_type__' in clsdict:
+                cls.type = clsdict['__return_type__']
+            register_function(identifier, cls, package)
         super(_GenericMeta, cls).__init__(clsname, bases, clsdict)
 
 
-class GenericFunction(Function):
+class GenericFunction(util.with_metaclass(_GenericMeta, Function)):
     """Define a 'generic' function.
 
     A generic function is a pre-established :class:`.Function`
@@ -112,7 +113,6 @@ class GenericFunction(Function):
        name is still recognized for backwards-compatibility.
 
     """
-    __metaclass__ = _GenericMeta
 
     coerce_arguments = True