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)
1  2 
src/nepi/testbeds/planetlab/tunproto.py
src/nepi/util/tunchannel.py

Simple merge