From: Gregory Farnum <greg@inktank.com>
Date: Mon, 7 Oct 2013 21:15:19 +0000 (-0700)
Subject: Merge pull request #697 from dachary/master
X-Git-Tag: v0.72-rc1~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9f75a423365a5290cc776ea7eced1ba8eeb5b1fe;p=ceph.git

Merge pull request #697 from dachary/master

This lets "make check" pass, so I like it.
Reviewed-by: Greg Farnum <greg@inktank.com>
---

9f75a423365a5290cc776ea7eced1ba8eeb5b1fe