tree 2fdc037df9de7150dc6f458238443b99997dc94e
parent 40e4f1cf22b5b987632433f21691ce3344bb0998
parent 3d2a5380a23ac4f1d9515705afa7d1975a304ff6
author Paul Webster <pwebster@ca.ibm.com> 1353034708 -0500
committer Paul Webster <pwebster@ca.ibm.com> 1353034708 -0500

Merge remote-tracking branch 'origin/R4_2_maintenance'

Conflicts:
	tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF