diff --git a/doc/TODO b/doc/TODO
index 6bacf7222e73a66f237b63ded6873ba6f10d6d1c..90a405c3ba7025ec84cd2267f58e2e2cf22ad99b 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -2,7 +2,7 @@
PostgreSQL TODO List
====================
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Wed Jan 31 19:32:31 EST 2007
+Last updated: Wed Jan 31 23:35:47 EST 2007
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1120,6 +1120,12 @@ Locking
http://archives.postgresql.org/pgsql-hackers/2004-11/msg00893.php
http://archives.postgresql.org/pgsql-hackers/2004-11/msg00905.php
+* Fix problem when multiple subtransactions of the same outer transaction
+ hold different types of locks, and one subtransaction aborts
+
+ http://archives.postgresql.org/pgsql-hackers/2006-11/msg01011.php
+ http://archives.postgresql.org/pgsql-hackers/2006-12/msg00001.php
+
Startup Time Improvements
=========================
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index f70139a2b400e74e3254a7d7590c4486de187242..220cb63a6f8b617bc445c7ae03a00112c09343c0 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -8,7 +8,7 @@
Current maintainer: Bruce Momjian (bruce@momjian.us)
-Last updated: Wed Jan 31 19:32:31 EST 2007
+Last updated: Wed Jan 31 23:35:47 EST 2007
The most recent version of this document can be viewed at
http://www.postgresql.org/docs/faqs.TODO.html.
@@ -1006,6 +1006,11 @@ first. There is also a developer's wiki at
Fix priority ordering of read and write light-weight locks (Neil)
http://archives.postgresql.org/pgsql-hackers/2004-11/msg00893.php
http://archives.postgresql.org/pgsql-hackers/2004-11/msg00905.php
+
+ Fix problem when multiple subtransactions of the same outer transaction
+ hold different types of locks, and one subtransaction aborts
+ http://archives.postgresql.org/pgsql-hackers/2006-11/msg01011.php
+ http://archives.postgresql.org/pgsql-hackers/2006-12/msg00001.php