ControlSystemStudio/cs-studio — pull request #335 by kasemir (2014-01-08 17:27:22+00:00)
Title: Tweaks that make 'master' closer to '4.0.x'

Mostly tweaks related to test code, removes unnecessary differences between master and 4.0.x branches.