From: caleb miles <caleb.miles@inktank.com>
Date: Thu, 14 Jun 2012 19:59:40 +0000 (-0700)
Subject: Merge branch 'master' of github.com:ceph/ceph into wip-2543
X-Git-Tag: v0.49~85
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41488c026caa54a5bfdaadeef1c62f4b8352aa9c;p=ceph.git

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

41488c026caa54a5bfdaadeef1c62f4b8352aa9c