Merge branch 'master' into sfa-geni-v3
Thierry Parmentelat [Fri, 31 May 2013 13:17:02 +0000 (15:17 +0200)]
1  2 
system/TestPlc.py

Simple merge