From: Samuel Just <sam.just@inktank.com>
Date: Wed, 31 Oct 2012 18:37:06 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/wip_dep_fix'
X-Git-Tag: v0.55~130^2~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2857a7f49baad804759c5eadfc69804547377e37;p=ceph.git

Merge remote-tracking branch 'upstream/wip_dep_fix'

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
---

2857a7f49baad804759c5eadfc69804547377e37