From: Sage Weil <sage@newdream.net>
Date: Wed, 3 Nov 2010 23:40:19 +0000 (-0700)
Subject: Merge branch 'mix_stale' into unstable
X-Git-Tag: v0.23~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc9059e5270380c3266f7f958da6a8cc9b042f22;p=ceph.git

Merge branch 'mix_stale' into unstable
---

fc9059e5270380c3266f7f958da6a8cc9b042f22