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

Merge branch 'next'
---

9ef6041fe7f001f0714aa99846783beb47bc756b