GPL Licensed Files in 8.1.4

PostgreSQL 8.1.4 appears to have 2 GPL licensed files according to
licenses embedded in the source. In both cases, the files have had a
history of discussion within the PostgreSQL forums. I'm hoping, through
this question, to find more concrete information that the GPL code is
really approved to be licensed under the PostgreSQL BSD license or to
understand if there is a plan to update the source to remove the GPL
reference.

The 2 files are:
- user_lock code from Massimo Dal Zotto
- clean_pending.pl from Steve Singer, Navtech Systems

I noticed that Massimo Zotto posted a forum answer back in 2001 (:
http://archives.postgresql.org/pgsql-hackers/2001-08/msg01089.php) but his
statement that the file would be updated to non-GPL text seems to not have
been completed. Is there any other authorization or correspondence
stating his approval that the user_lock code is licensed to the PostgreSQL
project as BSD?

There was also a separate forum entry
(http://archives.postgresql.org/pgsql-hackers/2005-06/msg00350.php) on
clean_pending.pl where it was speculated that the GPL text was added in
error since the other source files in this directory are BSD. Has Steve
Singer forwarded an authorization that this file is licensed to the
PostgreSQL project as BSD?

Thank you,

Charles Comiskey
Tivoli Software
IBM Software Group
comiskey(at)us(dot)ibm(dot)com
919.224.1223 or TL 687-1223