Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 30 Sep 2011 06:26:47 +0000 (08:26 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 30 Sep 2011 06:26:47 +0000 (08:26 +0200)
1  2 
src/nepi/testbeds/planetlab/node.py

Simple merge