From: Yehuda Sadeh <yehuda@inktank.com>
Date: Thu, 22 Nov 2012 20:57:33 +0000 (-0800)
Subject: Merge remote-tracking branch 'origin/next' into next
X-Git-Tag: v0.55~60
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3110e5ca4237a5542e7e06067d2a9b3c28da05c7;p=ceph.git

Merge remote-tracking branch 'origin/next' into next
---

3110e5ca4237a5542e7e06067d2a9b3c28da05c7