From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 7 May 2013 02:51:47 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.62~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e5b25bd36bd7e743e22c0ec4e4f050d2af805307;p=ceph.git

Merge branch 'next'
---

e5b25bd36bd7e743e22c0ec4e4f050d2af805307