From: Gary Lowell <gary.lowell@inktank.com>
Date: Thu, 21 Mar 2013 07:40:16 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.60~25
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d67eee1d11d313817fae5a672ab835777a6601e2;p=ceph.git

Merge branch 'next'
---

d67eee1d11d313817fae5a672ab835777a6601e2