From b5b2f93f7ea702181c22f6f5e01634cff0662e79 Mon Sep 17 00:00:00 2001
From: Jaime Casanova <jaime@2ndQuadrant.com>
Date: Fri, 2 Dec 2011 00:28:17 -0500
Subject: [PATCH] Merge branches 'master' and 'async'