From: Samuel Just <sam.just@inktank.com>
Date: Wed, 24 Apr 2013 21:03:38 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip_2476' into next
X-Git-Tag: v0.61~105
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5668e5b5a458fa9404dac85e722bc64ca86bdc46;p=ceph.git

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

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

5668e5b5a458fa9404dac85e722bc64ca86bdc46