From: Warren Usui <warren.usui@inktank.com>
Date: Wed, 8 May 2013 02:27:51 +0000 (-0700)
Subject: Merge branch 'wip-teuth4768a-wusui'
X-Git-Tag: v10.2.8~13^2~2^2~4^2~4^2~5^2~3^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2c34d1971f1e82311b364bf8efe60b223158d676;p=ceph-ci.git

Merge branch 'wip-teuth4768a-wusui'

Conflicts:
	teuthology/task/install.py
---

2c34d1971f1e82311b364bf8efe60b223158d676