From: John Wilkins <john.wilkins@inktank.com>
Date: Wed, 5 Sep 2012 00:17:07 +0000 (-0700)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v0.53~197
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ca7fb8381633225272cd4477a76f441680c31419;p=ceph.git

Merge branch 'master' of github.com:ceph/ceph
---

ca7fb8381633225272cd4477a76f441680c31419