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)
commit140300a38da236f8c88f2a85fd1699d300fa9024
tree9f8316a7b63538496910abb48f34866c4bc98e5e
parent0c9f86da04f9834904a8ce8618f3a6605f5a90af
parentd8902f7273a996b5806a6d04c9db1fc397c0342f
Merge commit 'origin/master'
sfa/plc/network.py