From: John Wilkins <john.wilkins@inktank.com>
Date: Tue, 16 Apr 2013 20:29:15 +0000 (-0700)
Subject: Merge branch 'next' of https://github.com/ceph/ceph into next
X-Git-Tag: v0.61~191
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=103fb9b0fbbed300a679d5546a5c920d288e1d5c;p=ceph.git

Merge branch 'next' of https://github.com/ceph/ceph into next
---

103fb9b0fbbed300a679d5546a5c920d288e1d5c