From: Josh Durgin <josh.durgin@inktank.com>
Date: Fri, 29 Mar 2013 19:58:01 +0000 (-0700)
Subject: Merge remote branch 'origin/next'
X-Git-Tag: v0.62~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b504e444fc65038dfab7cc875363250287b884cc;p=ceph.git

Merge remote branch 'origin/next'
---

b504e444fc65038dfab7cc875363250287b884cc