Import time; fix variable name
Merge branch 'vcs-fixes'

Conflicts:
	cyder/cydhcp/build/builder.py