From: Sage Weil <sage@inktank.com>
Date: Fri, 22 Feb 2013 01:30:46 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.59~148
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60ebf02a2890d8de7670924a0e89db9cefdeb144;p=ceph.git

Merge branch 'next'
---

60ebf02a2890d8de7670924a0e89db9cefdeb144