From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Tue, 24 May 2011 22:30:17 +0000 (-0700)
Subject: Merge commit 'origin/master' into rgw-multiuser
X-Git-Tag: v0.29~42
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95c594f6c6ad44affac3cab9a66a4d2f5812b2b7;p=ceph.git

Merge commit 'origin/master' into rgw-multiuser
---

95c594f6c6ad44affac3cab9a66a4d2f5812b2b7