From: Sage Weil <sage@inktank.com>
Date: Fri, 11 Jan 2013 02:04:55 +0000 (-0800)
Subject: Merge remote-tracking branch 'gh/wip-3633'
X-Git-Tag: 1.1.0~2379
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9e4a3f0399f5177a2bae1d9ee6acd5fa69df7ec1;p=teuthology.git

Merge remote-tracking branch 'gh/wip-3633'
---

9e4a3f0399f5177a2bae1d9ee6acd5fa69df7ec1