From: David Zafman <david.zafman@inktank.com>
Date: Tue, 12 Mar 2013 19:03:43 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-fix-librados-headers'
X-Git-Tag: v0.60~92
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9464b5e96594f9eec08ca399396a269bfda73178;p=ceph.git

Merge remote-tracking branch 'origin/wip-fix-librados-headers'
---

9464b5e96594f9eec08ca399396a269bfda73178