From: Samuel Just <sam.just@inktank.com>
Date: Fri, 15 Mar 2013 18:21:35 +0000 (-0700)
Subject: Merge branch 'next'
X-Git-Tag: v0.60~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39a66b86370769365544ab00d90f8bba1d47f567;p=ceph.git

Merge branch 'next'
---

39a66b86370769365544ab00d90f8bba1d47f567