v20110707-1506
Preparing 'master' for 4.2 work Conflicts: bundles/org.eclipse.ui/META-INF/MANIFEST.MF bundles/org.eclipse.ui/schema/viewActions.exsd
Preparing 'master' for 4.2 work Conflicts: bundles/org.eclipse.ui/META-INF/MANIFEST.MF bundles/org.eclipse.ui/schema/viewActions.exsd