From: Samuel Just <sam.just@inktank.com>
Date: Tue, 29 Oct 2013 05:51:04 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/next'
X-Git-Tag: v0.73~62
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00ddea37e4ccc691a6c972ee8f85f46205c81d66;p=ceph.git

Merge remote-tracking branch 'upstream/next'
---

00ddea37e4ccc691a6c972ee8f85f46205c81d66