From: Sage Weil <sage@inktank.com>
Date: Wed, 13 Mar 2013 23:37:29 +0000 (-0700)
Subject: Merge branch 'wip-4390-b'
X-Git-Tag: v0.60~81
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f67596a44739e8071cc97fb0463f37203502faaa;p=ceph.git

Merge branch 'wip-4390-b'

Reviewed-by: Greg Farnum <greg@inktank.com>
---

f67596a44739e8071cc97fb0463f37203502faaa