diff --git a/doc/TODO b/doc/TODO
index d32c559e5b4cc82f3eecbc9ef84adb112fab7eb4..7329f8417dd0083433c053fb6bbd83c9319c3cf6 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (pgman@candle.pha.pa.us)
-Last updated: Fri Jun 16 18:04:56 EDT 2006
+Last updated: Fri Jun 16 18:08:41 EDT 2006
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -725,6 +725,10 @@ SQL Commands
http://archives.postgresql.org/pgsql-patches/2006-02/msg00288.php
+ o Allow PL/python to composite types and result sets
+ once buggy assert-enabled versions of python can be detected
+
+ http://archives.postgresql.org/pgsql-patches/2006-04/msg00087.php
Clients
=======
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index cdedd929335c2477b459896b40a4b6958832aa96..c8dc98f441c15dbc399d757fc2513f1740850789 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
<body bgcolor="#FFFFFF" text="#000000" link="#FF0000" vlink="#A00000" alink="#0000FF">
<h1><a name="section_1">PostgreSQL TODO List</a></h1>
<p>Current maintainer: Bruce Momjian (<a href="mailto:pgman@candle.pha.pa.us">pgman@candle.pha.pa.us</a>)<br/>
-Last updated: Fri Jun 16 18:04:56 EDT 2006
+Last updated: Fri Jun 16 18:08:41 EDT 2006
</p>
<p>The most recent version of this document can be viewed at<br/>
<a href="http://www.postgresql.org/docs/faqs.TODO.html">http://www.postgresql.org/docs/faqs.TODO.html</a>.
@@ -657,6 +657,10 @@ first.
than PL/PgSQL
</li><li>Add PL/Python tracebacks
<p> <a href="http://archives.postgresql.org/pgsql-patches/2006-02/msg00288.php">http://archives.postgresql.org/pgsql-patches/2006-02/msg00288.php</a>
+</p>
+ </li><li>Allow PL/python to composite types and result sets
+ once buggy assert-enabled versions of python can be detected
+<p> <a href="http://archives.postgresql.org/pgsql-patches/2006-04/msg00087.php">http://archives.postgresql.org/pgsql-patches/2006-04/msg00087.php</a>
</p>
</li></ul>
</li></ul>