diff --git a/ChangeLog b/ChangeLog
index e1f6c394..b7dd37ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-18  Federico Di Gregorio  <fog@debian.org>
+
+	* MANIFEST.in: included debian directory.
+
 2005-04-10  Federico Di Gregorio  <fog@debian.org>
 
 	* psycopg/adapter_list.*: added list adapter. 
diff --git a/MANIFEST.in b/MANIFEST.in
index 680d3830..c11baade 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,6 +3,7 @@ recursive-include lib *.py
 recursive-include tests *.py
 recursive-include ZPsycopgDA *.py *.gif *.dtml
 recursive-include examples *.py somehackers.jpg whereareyou.jpg
+recursive-include debian *
 recursive-include doc TODO HACKING SUCCESS ChangeLog-1.x
 include scripts/maketypes.sh scripts/buildtypes.py
 include AUTHORS README INSTALL ChangeLog setup.py setup.cfg
diff --git a/lib/extras.py b/lib/extras.py
index 7be08a68..3e264a02 100644
--- a/lib/extras.py
+++ b/lib/extras.py
@@ -76,6 +76,9 @@ class DictRow(list):
 	    res.append((n, list.__getitem__(self, v)))
 	return res
     
+    def keys(self):
+	return self._cursor.index.keys()
+
 
 
 class SQL_IN(object):
diff --git a/setup.cfg b/setup.cfg
index e3d8983e..486c90fe 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [build_ext]
-define=PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3,PSYCOPG_DEBUG
+define=PSYCOPG_EXTENSIONS,PSYCOPG_DISPLAY_SIZE,HAVE_PQFREEMEM,HAVE_PQPROTOCOL3
 # PSYCOPG_DEBUG can be added to enable verbose debug information
 # PSYCOPG_OWN_QUOTING can be added above but it is deprecated