Merge branch 'master' of git://localhost/cs-studio
Merge branch 'master' of github.com:css-iter/cs-studio