From: Sage Weil <sage@newdream.net>
Date: Tue, 1 Nov 2011 19:35:47 +0000 (-0700)
Subject: Merge branch 'master' into wip-freebsd
X-Git-Tag: v0.39~170^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9252dccc547da14a787d3ce8a785c35c21d801dc;p=ceph.git

Merge branch 'master' into wip-freebsd
---

9252dccc547da14a787d3ce8a785c35c21d801dc