From: Samuel Just <sam.just@inktank.com>
Date: Fri, 21 Feb 2014 01:04:14 +0000 (-0800)
Subject: Merge remote-tracking branch 'upstream/next'
X-Git-Tag: v0.79~202
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6c20728658ea8c0261aab24fd081d65eb933b5ff;p=ceph.git

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

6c20728658ea8c0261aab24fd081d65eb933b5ff