From: Sage Weil <sage@newdream.net>
Date: Fri, 16 May 2008 17:17:21 +0000 (-0700)
Subject: Merge branch 'client' into unstable
X-Git-Tag: v0.3~209^2~49
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=011f725e9c65fdab818e1e1a96a265eee17484f9;p=ceph.git

Merge branch 'client' into unstable
---

011f725e9c65fdab818e1e1a96a265eee17484f9