tree 13acc4d771051cab380f8e219d368c26564313ce
parent d6b3ac5035616d471aa6ec40811300cc6e528cdf
parent 3d2a5380a23ac4f1d9515705afa7d1975a304ff6
author Paul Webster <pwebster@ca.ibm.com> 1358375511 -0500
committer Paul Webster <pwebster@ca.ibm.com> 1358375511 -0500

Merge remote-tracking branch 'origin/R4_2_maintenance'

Conflicts:
	bundles/org.eclipse.e4.ui.css.swt.theme/META-INF/MANIFEST.MF
	bundles/org.eclipse.e4.ui.css.swt.theme/src/org/eclipse/e4/ui/css/swt/internal/theme/ThemeEngine.java