better restart mechanism
better restart mechanism
Merge commit 'c55d15f'

Conflicts:
	lib/common_deploy/passenger.rb