From: Sage Weil <sage@inktank.com>
Date: Sat, 9 Feb 2013 17:41:02 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.58~113
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6d199e22fbe390bc2d6c4e1cd0c3fa319dc7a577;p=ceph.git

Merge branch 'next'
---

6d199e22fbe390bc2d6c4e1cd0c3fa319dc7a577