From: Sage Weil <sage.weil@dreamhost.com>
Date: Thu, 12 Jan 2012 18:35:03 +0000 (-0800)
Subject: Merge branch 'wip-makefile'
X-Git-Tag: v0.40~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=cedd92bea6f8380f6bd8c7ed434efe6ef5c89b85;p=ceph.git

Merge branch 'wip-makefile'
---

cedd92bea6f8380f6bd8c7ed434efe6ef5c89b85