From: Sage Weil <sage@newdream.net>
Date: Thu, 22 Jul 2010 21:17:56 +0000 (-0700)
Subject: Merge remote branch 'origin/large_objects' into unstable
X-Git-Tag: v0.21~48^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9a7acbfe36a7eb231a080ffef01b885024e3093;p=ceph.git

Merge remote branch 'origin/large_objects' into unstable
---

d9a7acbfe36a7eb231a080ffef01b885024e3093