DESCRIPTION

merged master changes

Conflicts:
	conf/couchbase-20-single-node.conf

Change-Id: I34ffcbb8b811725e8423501e2bbbe2630cac6871


COMMENTS

author: Zackery Barr
date: 2011-07-25 20:14:29.573000000

Patch Set 1: Abandoned

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