From: Sam Lang <sam.lang@inktank.com>
Date: Sun, 3 Feb 2013 17:38:10 +0000 (-0600)
Subject: Merge branch 'wip-misc-fixes'
X-Git-Tag: v0.94.10~27^2^2~364^2~1038
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a5ba4f6a9493e8ada44842c52def094c96701afa;p=ceph.git

Merge branch 'wip-misc-fixes'

Signed-off-by: Sam Lang <sam.lang@inktank.com>
---

a5ba4f6a9493e8ada44842c52def094c96701afa