Merge branch 'master' of ssh://git.eclipse.org/gitroot/virgo/org.eclipse.virgo.web into 3.6.0.D-20130225162156