diff -u boost1.40-1.40.0/debian/changelog boost1.40-1.40.0/debian/changelog
--- boost1.40-1.40.0/debian/changelog
+++ boost1.40-1.40.0/debian/changelog
@@ -1,3 +1,14 @@
+boost1.40 (1.40.0-4ubuntu4) lucid; urgency=low
+
+  [ Andrew Mitchell ]
+  * Apply patch from SVN r53731 to fix LP: #539049
+   - patches/python2.6.4.patch (Boost SVN r53731)
+
+  [ Scott Howard ]
+  * Refreshed patches, fixed Andrew's above patch for release.
+
+ -- Scott Howard <showard314@gmail.com>  Sat, 27 Mar 2010 15:57:40 -0400
+
 boost1.40 (1.40.0-4ubuntu3) lucid; urgency=low
 
   * Detect gcc atomic intrinsics, needed for arm spinlock (LP: #513721)
diff -u boost1.40-1.40.0/debian/patches/series boost1.40-1.40.0/debian/patches/series
--- boost1.40-1.40.0/debian/patches/series
+++ boost1.40-1.40.0/debian/patches/series
@@ -8,6 +8,7 @@
 jam-wall-clean.patch
 sh4.patch
 gcc-4.4.patch
+python2.6.4.patch
 boost-build-pythonid.patch
 hurd-ellint_rd.patch
 hurd-execution_monitor.patch
diff -u boost1.40-1.40.0/debian/patches/gcc-atomic-intrinsics.patch boost1.40-1.40.0/debian/patches/gcc-atomic-intrinsics.patch
--- boost1.40-1.40.0/debian/patches/gcc-atomic-intrinsics.patch
+++ boost1.40-1.40.0/debian/patches/gcc-atomic-intrinsics.patch
@@ -1,7 +1,7 @@
 Index: boost1.40-1.40.0/boost/smart_ptr/detail/spinlock_gcc_arm.hpp
 ===================================================================
---- boost1.40-1.40.0.orig/boost/smart_ptr/detail/spinlock_gcc_arm.hpp	2010-02-12 11:45:49.447980965 -0500
-+++ boost1.40-1.40.0/boost/smart_ptr/detail/spinlock_gcc_arm.hpp	2010-02-12 11:54:26.777979977 -0500
+--- boost1.40-1.40.0.orig/boost/smart_ptr/detail/spinlock_gcc_arm.hpp	2009-03-02 11:22:16.000000000 -0500
++++ boost1.40-1.40.0/boost/smart_ptr/detail/spinlock_gcc_arm.hpp	2010-03-27 15:40:14.227864125 -0400
 @@ -29,11 +29,15 @@
      {
          int r;
@@ -20,8 +20,8 @@
      }
 Index: boost1.40-1.40.0/libs/smart_ptr/CMakeLists.txt
 ===================================================================
---- boost1.40-1.40.0.orig/libs/smart_ptr/CMakeLists.txt	2010-02-12 11:51:04.067982098 -0500
-+++ boost1.40-1.40.0/libs/smart_ptr/CMakeLists.txt	2010-02-12 11:52:10.467982966 -0500
+--- boost1.40-1.40.0.orig/libs/smart_ptr/CMakeLists.txt	2009-07-22 17:51:01.000000000 -0400
++++ boost1.40-1.40.0/libs/smart_ptr/CMakeLists.txt	2010-03-27 15:40:14.227864125 -0400
 @@ -33,4 +33,10 @@
    #  MAINTAINERS 
  )
only in patch2:
unchanged:
--- boost1.40-1.40.0.orig/debian/patches/python2.6.4.patch
+++ boost1.40-1.40.0/debian/patches/python2.6.4.patch
@@ -0,0 +1,67 @@
+Index: boost1.38-1.38.0/libs/python/src/object/class.cpp
+===================================================================
+--- boost1.38-1.38.0.orig/libs/python/src/object/class.cpp	2009-11-11 16:50:27.000000000 +1300
++++ boost1.38-1.38.0/libs/python/src/object/class.cpp	2009-11-11 16:50:55.000000000 +1300
+@@ -67,8 +67,44 @@
+       PyObject *prop_set;
+       PyObject *prop_del;
+       PyObject *prop_doc;
++      int getter_doc;
+   } propertyobject;
+ 
++  // Copied from Python source and removed the part for setting docstring,
++  // since we don't have a setter for __doc__ and trying to set it will
++  // cause the init fail.
++  static int property_init(PyObject *self, PyObject *args, PyObject *kwds)
++  {
++      PyObject *get = NULL, *set = NULL, *del = NULL, *doc = NULL;
++      static char *kwlist[] = {"fget", "fset", "fdel", "doc", 0};
++      propertyobject *prop = (propertyobject *)self;
++
++      if (!PyArg_ParseTupleAndKeywords(args, kwds, "|OOOO:property",
++                  kwlist, &get, &set, &del, &doc))
++          return -1;
++
++      if (get == Py_None)
++          get = NULL;
++      if (set == Py_None)
++          set = NULL;
++      if (del == Py_None)
++          del = NULL;
++
++      Py_XINCREF(get);
++      Py_XINCREF(set);
++      Py_XINCREF(del);
++      Py_XINCREF(doc);
++
++      prop->prop_get = get;
++      prop->prop_set = set;
++      prop->prop_del = del;
++      prop->prop_doc = doc;
++      prop->getter_doc = 0;
++
++      return 0;
++  }
++
++ 
+   static PyObject *
+   static_data_descr_get(PyObject *self, PyObject * /*obj*/, PyObject * /*type*/)
+   {
+@@ -109,7 +145,7 @@
+     PyObject_HEAD_INIT(0)//&PyType_Type)
+     0,
+     const_cast<char*>("Boost.Python.StaticProperty"),
+-    PyType_Type.tp_basicsize,
++    sizeof(propertyobject),
+     0,
+     0,                                      /* tp_dealloc */
+     0,                                      /* tp_print */
+@@ -143,7 +179,7 @@
+     static_data_descr_get,                                      /* tp_descr_get */
+     static_data_descr_set,                                      /* tp_descr_set */
+     0,                                      /* tp_dictoffset */
+-    0,                                      /* tp_init */
++    property_init,                                      /* tp_init */
+     0,                                      /* tp_alloc */
+     0, // filled in with type_new           /* tp_new */
+     0, // filled in with __PyObject_GC_Del  /* tp_free */