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

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

705f4c1f6ee526cb1cf3b03681744a09d9cae8a4