DESCRIPTION

Merge branch '1.7.alpha2' of github.com:membase/testrunner into 1.7.alpha2

Conflicts:
	lib/memcached/helper/data_helper.py
	pytests/management/replication/replicationtests.py

Change-Id: I4d175e74fbcbe55405c643cb364359e968f00c75


COMMENTS

author: Andreas Short
date: 2011-06-24 17:07:00.129000000

Change has been successfully pushed.

-------------------------------------
