From: Samuel Just <sam.just@inktank.com>
Date: Tue, 12 Feb 2013 18:15:26 +0000 (-0800)
Subject: Merge branch 'wip-4064-sam'
X-Git-Tag: v0.58~96
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0942e005448efb60ab31fe98f156d1f1b0e377cd;p=ceph.git

Merge branch 'wip-4064-sam'

Reviewed-by: Sage Weil <sage@inktank.com>
---

0942e005448efb60ab31fe98f156d1f1b0e377cd