1

Conflicts:
	plugins/org.jboss.tools.vpe.browsersim/src/org/jboss/tools/vpe/browsersim/BrowserSimRunner.java