I've attached a rebased patch which fixes up the recent conflicts. Noother changes were made.
-- David Rowley http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services