Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Mon, 28 Mar 2011 20:52:42 +0000 (22:52 +0200)
committerroot <root@blitz.inria.fr>
Mon, 28 Mar 2011 20:52:42 +0000 (22:52 +0200)
1  2 
sfa/plc/network.py

Simple merge