Merge non-handshake stuff
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 4 Sep 2011 16:54:21 +0000 (18:54 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 4 Sep 2011 16:54:21 +0000 (18:54 +0200)

Trivial merge