From: Greg Farnum <gregory.farnum@dreamhost.com>
Date: Thu, 23 Feb 2012 23:06:32 +0000 (-0800)
Subject: Merge remote branch 'origin/wip-dencoder'
X-Git-Tag: v0.43~32
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5aa60ce4163f1e98f4e936c25ba0182546e540c2;p=ceph.git

Merge remote branch 'origin/wip-dencoder'

Reviewed-by: Greg Farnum <gregory.farnum@dreamhost.com>
---

5aa60ce4163f1e98f4e936c25ba0182546e540c2