From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 19 Aug 2010 23:49:55 +0000 (-0700)
Subject: Merge branch 'unstable' into rootsnap
X-Git-Tag: v0.22~229^2~14
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=54d2fe1585a7c0afe6d230e79e1db9fba6b2f2af;p=ceph.git

Merge branch 'unstable' into rootsnap
---

54d2fe1585a7c0afe6d230e79e1db9fba6b2f2af