I've attached an updated patch which fixes the conflict with 0a9d7e1f6d8
-- David Rowley http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services