Merge branch 'master' of ssh://yvyang@git.eclipse.org/gitroot/xwt/org.eclipse.xwt.git