From dfa71be3c56ea5ac8e1e80aa646e2e84c672f284 Mon Sep 17 00:00:00 2001
From: Gregory Burd <greg@basho.com>
Date: Wed, 30 Nov 2011 14:58:34 -0500
Subject: [PATCH] Merge branches 'lager-integration' and 'master'