From: Sage Weil <sage.weil@dreamhost.com>
Date: Wed, 25 Jan 2012 22:03:18 +0000 (-0800)
Subject: Merge branch 'wip-kb'
X-Git-Tag: v0.41~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0b088eb5376a1b071104769e86e5eb8eae06c1ff;p=ceph.git

Merge branch 'wip-kb'

Reviewed-by: Samuel Just <samuel.just@dreamhost.com>
---

0b088eb5376a1b071104769e86e5eb8eae06c1ff