ControlSystemStudio/cs-studio — pull request #450 by arnaudf-iter (2014-03-31 15:19:49+00:00)
Title: Merge last ITER changes

resolves #448 - RAP build fail
resolves #385 - Time Format yyyy/MM/dd hh:mm:ss.SSS