Merge with HEAD, close aly's branch.
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 4 Sep 2011 17:31:46 +0000 (19:31 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 4 Sep 2011 17:31:46 +0000 (19:31 +0200)
commit221dc7a823e3310b5ef1cc8f23d49ec1e65b687e
treec199262426e0157acb7c71a11ae437082319138a
parent4828bd841968bf113bc3c4a7c94da979e93469c5
parent933c66b106c614a91bd0578ca76f3fd8f6d2e2f6
Merge with HEAD, close aly's branch.
src/nepi/testbeds/planetlab/tunproto.py
src/nepi/util/tunchannel.py