DESCRIPTION

Merge commit 'refs/changes/70/9070/1' of ssh://review.couchbase.org:29418/testrunner into HEAD

Conflicts:
	conf/py-view.conf
	pytests/memcapable.py

Change-Id: I6eb645998f9cbd39a563b1bf2d1cc4b102bbccfc


COMMENTS

