From: Sage Weil <sage@inktank.com>
Date: Sun, 24 Feb 2013 21:22:47 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.59~130
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0be28af0bb129aad915895744bc091f21336642e;p=ceph.git

Merge remote-tracking branch 'gh/next'
---

0be28af0bb129aad915895744bc091f21336642e