From: Sage Weil <sage@newdream.net>
Date: Tue, 14 Dec 2010 20:47:40 +0000 (-0800)
Subject: Merge branch 'sync2' into unstable
X-Git-Tag: v0.25~460
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c8d9b20cc572a651ac2f9084abe51a6d9bed18f2;p=ceph.git

Merge branch 'sync2' into unstable
---

c8d9b20cc572a651ac2f9084abe51a6d9bed18f2