From: David Zafman <david.zafman@inktank.com>
Date: Thu, 12 Sep 2013 18:13:50 +0000 (-0700)
Subject: Merge branch 'wip-6226'
X-Git-Tag: v0.71~131
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=388dd1e2012eacc1e91fa2fb6b8cb1fd71f1834c;p=ceph.git

Merge branch 'wip-6226'
---

388dd1e2012eacc1e91fa2fb6b8cb1fd71f1834c