From: Dan Mick <dan.mick@inktank.com>
Date: Thu, 6 Dec 2012 01:39:17 +0000 (-0800)
Subject: Merge branch 'next'
X-Git-Tag: v0.57~346
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7f906b5afd5f28a3df93c31ea738e8dca8ce7992;p=ceph.git

Merge branch 'next'

Pull in fixes for 3567 and 3524
---

7f906b5afd5f28a3df93c31ea738e8dca8ce7992