fixing wrongly repaired svn conflict
Authored by: vsp_nagel 2014-12-08
Parent: [r31446]
Child: [r31448]