From: Sage Weil <sage@inktank.com>
Date: Sat, 23 Mar 2013 18:03:58 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.62~182
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84738791fe59b3a4d196fa19d42d1781931ffed7;p=ceph.git

Merge branch 'next'
---

84738791fe59b3a4d196fa19d42d1781931ffed7