Merge branch 'master' of http://git.eclipse.org/gitroot/equinox/rt.equinox.incubator