Merge branch 'master' of ssh://dgreen@git.eclipse.org/gitroot/mylyn/org.eclipse.mylyn.incubator.git