I've attached a rebased patch which fixes the conflicts caused by fd1a421.
-- David Rowley http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services