rsync with dianping branch