DESCRIPTION

CBQE-1705:  replace changes that failed to merge from Jasmin Rangel:

  http://review.couchbase.org/#/c/31574
  http://review.couchbase.org/#/c/31577

Change-Id: I90fd61cddc962a75b4a48138b09e87db1be9111d
Reviewed-on: http://review.couchbase.org/31631
Tested-by: Hugo Blankenship xxx@xxx.xxx
Reviewed-by: Sean Khan xxx@xxx.xxx


COMMENTS

author: Sean Khan
date: 2014-01-06 21:00:51.644000000

Change has been successfully cherry-picked as 4cdc324c5ce1e3397fcfdf795beee51102e00e1d

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