Heikki, would you be able to give this patch a look and perhaps commitit?
-- Álvaro Herrera http://www.2ndQuadrant.com/PostgreSQL Development, 24x7 Support, Training & Services