From: Josh Durgin <josh.durgin@inktank.com>
Date: Thu, 6 Dec 2012 00:08:51 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.94.10~27^2^2~844
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4acc0789c90dc614f79591bb7763036a4da4605b;p=ceph.git

Merge branch 'next'
---

4acc0789c90dc614f79591bb7763036a4da4605b