Merge branch 'vanilla-libeio'
authorRyan Dahl <ry@tinyclouds.org>
Tue, 11 Jan 2011 22:13:06 +0000 (14:13 -0800)
committerRyan Dahl <ry@tinyclouds.org>
Tue, 11 Jan 2011 22:13:06 +0000 (14:13 -0800)
commit464f5d4e13ab5feff085be41011c8e478ac63ef8
tree1813b207075320d49632cb7b422157300e8ef197
parent435ece505897c8931548162a1ccc5389e3fc558c
parentb8d63c10cd2e4210c5c43f146537eb24c00a0bf5
Merge branch 'vanilla-libeio'

Conflicts:
deps/libeio/config.h.in
deps/libeio/config.h.in
deps/libeio/eio.c
deps/libeio/eio.h
deps/libeio/xthread.h