From: Sage Weil <sage@inktank.com>
Date: Sat, 9 Mar 2013 02:38:32 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.60~108
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=494f968aafeaa7327fef84b14ace752958e2bf6c;p=ceph.git

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

494f968aafeaa7327fef84b14ace752958e2bf6c