tree 6748a3ebf539e8ab045c901fd93ac5fea45366f8
parent b6ece334babdb7c8373e8e213e3a79d79f282a32
parent e14b0598ca6a0d5a721e959caf5a6384918714ef
author John Arthorne <John_Arthorne@ca.ibm.com> 1314297435 -0400
committer John Arthorne <John_Arthorne@ca.ibm.com> 1314297435 -0400

Merge branch 'master' into johntestaug25

Conflicts:
	tests/org.eclipse.core.tests.harness/src/org/eclipse/core/tests/harness/FileSystemHelper.java