From: Sage Weil <sage@newdream.net>
Date: Thu, 18 Sep 2008 18:38:33 +0000 (-0700)
Subject: Merge commit 'c43adbe5d679e4920791f4cf4baa294eab36ccfa'
X-Git-Tag: v0.4~67^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a54be15446b074d26aeff0e454ec5c93ae60bed4;p=ceph.git

Merge commit 'c43adbe5d679e4920791f4cf4baa294eab36ccfa'

Conflicts:

	src/kernel/osd_client.c
---

a54be15446b074d26aeff0e454ec5c93ae60bed4