Merge branch 'master' into errorstate
authorSamuel Cormier-Iijima <sciyoshi@gmail.com>
Fri, 29 Feb 2008 17:47:21 +0000 (12:47 -0500)
committerSamuel Cormier-Iijima <sciyoshi@gmail.com>
Fri, 29 Feb 2008 17:47:21 +0000 (12:47 -0500)
commita7b5dcd5941e314caa53623f6b3d53e2d2d0c7d8
tree3dcb3e033658da02a1834bc004ee740394933ed0
parentb9453dd5e1e0a4c94a766bc741dc7d4a9457f686
parent48aa363fffb042f947130762acc7cd3c787b11d9
Merge branch 'master' into errorstate

Conflicts:

gnio/gsocket.c
gnio/gsocket.c