From 21017f2d950e30722db779036498baec988cdb12 Mon Sep 17 00:00:00 2001
From: Gregory Burd <greg@basho.com>
Date: Mon, 28 Nov 2011 18:44:21 -0500
Subject: [PATCH] Merge branch 'master', remote-tracking branch 'origin'