From: Colin Patrick McCabe <cmccabe@alumni.cmu.edu>
Date: Tue, 10 May 2011 23:58:40 +0000 (-0700)
Subject: Merge branch 'wip-merge-radostool-with-radossync'
X-Git-Tag: v0.29~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=59995908538889646f9ae29574e29b16b3fcfd3b;p=ceph.git

Merge branch 'wip-merge-radostool-with-radossync'
---

59995908538889646f9ae29574e29b16b3fcfd3b