From: Samuel Just <sam.just@inktank.com>
Date: Sat, 20 Apr 2013 00:11:29 +0000 (-0700)
Subject: Merge branch 'wip_4662_clean' into next
X-Git-Tag: v0.61~136
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=481c532ff361b21e044621ac13c8f00ebfb1b3dc;p=ceph.git

Merge branch 'wip_4662_clean' into next

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

481c532ff361b21e044621ac13c8f00ebfb1b3dc