Merge branch 'socket' into transsock
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 16:09:12 +0000 (17:09 +0100)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 21 Mar 2008 16:09:12 +0000 (17:09 +0100)

Trivial merge