From c72f5919977e4865dfff599a8057d5cdb77e3bd6 Mon Sep 17 00:00:00 2001
From: jkauttio <jkauttio@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Fri, 25 Apr 2014 13:47:13 +0000
Subject: [PATCH] Merge changes from trunk

refs #2924

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/dev-jkauttio@29356 ac1ea38d-2e2b-0410-8846-a27921b304fc
-- 
2.47.1