Merge commit 'origin/master'
authorroot <root@blitz.inria.fr>
Mon, 28 Mar 2011 21:04:44 +0000 (23:04 +0200)
committerroot <root@blitz.inria.fr>
Mon, 28 Mar 2011 21:04:44 +0000 (23:04 +0200)
commit5525a97f400f995d64eb23841a66e1f9ed2d53a3
tree7e059be1887ab4e10cc195601c10a0532ccafdae
parent140300a38da236f8c88f2a85fd1699d300fa9024
parent774b7528650545173cc895e9b1a70f6f3d6547b2
Merge commit 'origin/master'
sfa/plc/network.py