From: lehtonen <lehtonen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 28 May 2012 15:14:16 +0000 (+0000)
Subject: Merge until trunk@25061 to branches/simantics-1.6 on 2012-05-28. refs #3455
X-Git-Tag: simantics-1.6~2
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=cd122951a4eb8851f7c65c9abe2022e51af26d9c;p=simantics%2Fsysdyn.git

Merge until trunk@25061 to branches/simantics-1.6 on 2012-05-28. refs #3455

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/simantics-1.6@25063 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

cd122951a4eb8851f7c65c9abe2022e51af26d9c