From: Sage Weil <sage@inktank.com>
Date: Sat, 29 Dec 2012 01:19:46 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/next'
X-Git-Tag: v0.57~269
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83c8025d121bad6ce6110a0dc121b68ac3a2021f;p=ceph.git

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

83c8025d121bad6ce6110a0dc121b68ac3a2021f