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

Merge branch 'next'
---

e3fb095d8aa88556e4356c76b848fa61b09acbc0