From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 23 Jul 2013 06:19:47 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.68~135
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc6cb81ebae3b4bc3634e8db04218c9d838db6eb;p=ceph.git

Merge branch 'next'
---

fc6cb81ebae3b4bc3634e8db04218c9d838db6eb