From: Sage Weil <sage.weil@dreamhost.com>
Date: Wed, 18 Jan 2012 01:33:57 +0000 (-0800)
Subject: Merge remote branch 'gh/master' into wip-op-data-mux
X-Git-Tag: v0.41~27^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2bffed3bc94ff4aa8ade6f3a504d418b3a2a2fa3;p=ceph.git

Merge remote branch 'gh/master' into wip-op-data-mux
---

2bffed3bc94ff4aa8ade6f3a504d418b3a2a2fa3