I pushed your 25, with some additional minor tweaks. I hope I didn't break anything; please test.
I've made a few tests and all looks well. I guess the build farm will say if it does not like it.
Thanks, -- Fabien. -- Sent via pgsql-hackers mailing list (firstname.lastname@example.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers