Here is version 22 of this patch. This version contains fixes to issuesreported by Andres, as well as a rebase to latest master.
-- Álvaro Herrera http://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Training & Services