From: Samuel Just <sam.just@inktank.com>
Date: Fri, 31 May 2013 05:39:12 +0000 (-0700)
Subject: Merge branch 'wip-5046'
X-Git-Tag: v0.65~177
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fbf5a242d91e293e4e24fbb94e31e163374c7912;p=ceph.git

Merge branch 'wip-5046'

Reviewed-by: Samuel Just <sam.just@inktank.com>
---

fbf5a242d91e293e4e24fbb94e31e163374c7912