Merge branch 'master' of
ssh://ovander@git.eclipse.org/gitroot/epf/org.eclipse.epf.wiki.git