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)
commitc381d8a644a831bc2be8cfc2e41647c06d511c9f
treeca914b9368ca8d01c5d7610150eb7edeed0cf278
parent99ebc6e140e5fbb14d2071b8fc2519005602a975
parentb1ea860a6cb4d53819c1acf89ab4b56ca0cf3e01
Merge non-handshake stuff