Merged

git-svn-id: http://localhost/svn/core/template/trunk@38 88ec9e9a-694c-41cc-b543-b5cda355a820
Merged