Merge branch 'master' into sfa-geni-v3
Thierry Parmentelat [Tue, 27 Aug 2013 12:48:58 +0000 (14:48 +0200)]
1  2 
system/TestPlc.py

Simple merge