wtf
Merge branch '1.2_eclipse' of
ssh://jreimann@gerrit.intra:29418/org.openscada.aurora into 1.2_eclipse

Conflicts:
	org.eclipse.scada.core.info/META-INF/MANIFEST.MF
	org.eclipse.scada.core/META-INF/MANIFEST.MF
	org.eclipse.scada.ds/META-INF/MANIFEST.MF
	org.eclipse.scada.sec.provider.plain.property.test/META-INF/MANIFEST.MF