From: Gary Lowell <gary.lowell@inktank.com>
Date: Tue, 25 Jun 2013 20:45:22 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.66~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=70be76b2e2b504a6255227b47c06fcd43c82bdd1;p=ceph.git

Merge branch 'next'
---

70be76b2e2b504a6255227b47c06fcd43c82bdd1