Merge branch 'master' into sfa-geni-v3
Thierry Parmentelat [Wed, 17 Apr 2013 07:29:10 +0000 (09:29 +0200)]
1  2 
system/TestPlc.py
system/TestSliceSfa.py

Simple merge
Simple merge