Merging with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 18 Jul 2011 11:29:18 +0000 (13:29 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 18 Jul 2011 11:29:18 +0000 (13:29 +0200)
1  2 
src/nepi/util/proxy.py

Simple merge