From: Sage Weil <sage@newdream.net>
Date: Thu, 23 Jun 2011 20:16:29 +0000 (-0700)
Subject: Merge remote branch 'origin/stable' into next
X-Git-Tag: v0.30~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7cef3923804b80bd4f8a90a7e448b6ff9d42b662;p=ceph.git

Merge remote branch 'origin/stable' into next

Conflicts:
	src/librbd.cc
---

7cef3923804b80bd4f8a90a7e448b6ff9d42b662