Merge of descr-branch back into trunk.
diff --git a/Makefile.pre.in b/Makefile.pre.in
index 9fbf29d..ff22ef3 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -237,6 +237,7 @@
Objects/classobject.o \
Objects/cobject.o \
Objects/complexobject.o \
+ Objects/descrobject.o \
Objects/fileobject.o \
Objects/floatobject.o \
Objects/frameobject.o \
@@ -438,6 +439,7 @@
Include/tupleobject.h \
Include/listobject.h \
Include/iterobject.h \
+ Include/descrobject.h \
Include/dictobject.h \
Include/methodobject.h \
Include/moduleobject.h \