From: Sage Weil <sage@newdream.net>
Date: Sat, 28 Jan 2012 18:04:45 +0000 (-0800)
Subject: Merge branch 'stable'
X-Git-Tag: v0.44~118
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d43387c3257f55dfb386797f0fc4d81d28ed3d86;p=ceph.git

Merge branch 'stable'
---

d43387c3257f55dfb386797f0fc4d81d28ed3d86