From: Sage Weil <sage@newdream.net>
Date: Fri, 9 May 2008 17:06:31 +0000 (-0700)
Subject: Merge branch 'encoding' into unstable
X-Git-Tag: v0.3~239
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b114ccdd276738a9e8d8b121b17efdcc4d82dfde;p=ceph.git

Merge branch 'encoding' into unstable
---

b114ccdd276738a9e8d8b121b17efdcc4d82dfde