new version number.

Merge remote branch 'origin/R4_2_maintenance'

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