From: Sage Weil <sage@newdream.net>
Date: Wed, 21 Jul 2010 20:30:02 +0000 (-0700)
Subject: Merge remote branch 'origin/debian' into unstable
X-Git-Tag: v0.21~75
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6aa32f8c269647e57a1ff7e14ab2697aa6ea1ce5;p=ceph.git

Merge remote branch 'origin/debian' into unstable
---

6aa32f8c269647e57a1ff7e14ab2697aa6ea1ce5