Merge branch 'master' of
ssh://aweber@git.eclipse.org/gitroot/www.eclipse.org/smila.git

Conflicts:
	documentation.php