From: Samuel Just <sam.just@inktank.com>
Date: Wed, 1 May 2013 23:11:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip_4884' into next
X-Git-Tag: v0.61~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c194151a85892fd204f24f29b03ba1effc49873c;p=ceph.git

Merge remote-tracking branch 'upstream/wip_4884' into next

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

c194151a85892fd204f24f29b03ba1effc49873c