Merge branch 'master' into sfa-geni-v3
Thierry Parmentelat [Thu, 25 Apr 2013 12:30:42 +0000 (14:30 +0200)]
1  2 
system/TestPlc.py

Simple merge