From: Sage Weil <sage@inktank.com>
Date: Wed, 19 Jun 2013 16:58:54 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.66~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a3f0b3c5bfbb776024716f9cf3f4d916c1060c3;p=ceph.git

Merge branch 'next'
---

1a3f0b3c5bfbb776024716f9cf3f4d916c1060c3