From: Greg Farnum <greg@inktank.com>
Date: Thu, 27 Jun 2013 22:23:00 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.67-rc1~174
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8f0fbc22c835dce1be8137c442e2bde55f00e585;p=ceph.git

Merge branch 'next'
---

8f0fbc22c835dce1be8137c442e2bde55f00e585