From: Samuel Just <sam.just@inktank.com>
Date: Mon, 17 Jun 2013 20:29:57 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.66~58
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5cf5f18e3d5521007d57c406fdd13ca626926f1c;p=ceph.git

Merge branch 'next'
---

5cf5f18e3d5521007d57c406fdd13ca626926f1c