From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 6 Jul 2012 17:12:23 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/stable' into next
X-Git-Tag: v0.49~29
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d59b2db4ab059fc69c052aace0fc40c73debb0ea;p=ceph.git

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

d59b2db4ab059fc69c052aace0fc40c73debb0ea