From: caleb miles <caselim@gmail.com>
Date: Tue, 26 Jun 2012 06:14:09 +0000 (-0700)
Subject: Merge branch 'master' of github.com:ceph/ceph
X-Git-Tag: v0.49~83
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d82357df9b2aee0eb3f75f90c30eef618a9035a4;p=ceph.git

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

d82357df9b2aee0eb3f75f90c30eef618a9035a4