From: Samuel Just <sam.just@inktank.com>
Date: Mon, 22 Jul 2013 17:32:47 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/next'
X-Git-Tag: v0.68~139
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e71808f6961af05964f61a1e6af2c63be0464ae8;p=ceph.git

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

e71808f6961af05964f61a1e6af2c63be0464ae8