From: Sage Weil <sage.weil@dreamhost.com>
Date: Mon, 28 Feb 2011 19:19:37 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.26~274
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a2ffef9d40f372edd2969f5039b9d68153b9aa6e;p=ceph.git

Merge branch 'next'

Conflicts:
	src/pybind/rados.py
---

a2ffef9d40f372edd2969f5039b9d68153b9aa6e