Merge branch 'socket' into next
authorJean Privat <jean@pryen.org>
Thu, 16 May 2013 14:19:26 +0000 (10:19 -0400)
committerJean Privat <jean@pryen.org>
Thu, 16 May 2013 14:19:26 +0000 (10:19 -0400)

Trivial merge