Merge branch 'master' of ssh://mparker@git.eclipse.org/gitroot/virgo/org.eclipse.virgo.ide.git