From: Thadeu Lima de Souza Cascardo <cascardo@minaslivre.org>
Date: Mon, 10 Mar 2008 12:38:45 +0000 (-0300)
Subject: Merge commit 'scormi3/master'
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fgnio.git;a=commitdiff_plain;h=932359e12259081300067d273febe261eee0c870

Merge commit 'scormi3/master'

Conflicts:

	gnio/gsocket.c
	gnio/gsocket.h
---

932359e12259081300067d273febe261eee0c870