Merge Trond, this is the preliminary support for Windows.

author Brian Aker <brian@gaz>

Wed, 28 Jul 2010 20:59:36 +0000 (13:59 -0700)

committer Brian Aker <brian@gaz>

Wed, 28 Jul 2010 20:59:36 +0000 (13:59 -0700)
author Brian Aker <brian@gaz>
Wed, 28 Jul 2010 20:59:36 +0000 (13:59 -0700)
committer Brian Aker <brian@gaz>
Wed, 28 Jul 2010 20:59:36 +0000 (13:59 -0700)
diff --cc clients/memstat.c
Simple merge
diff --cc clients/utilities.c
Simple merge
diff --cc tests/mem_functions.c
Simple merge
diff --cc tests/server.c
Simple merge
author	Brian Aker <brian@gaz>
	Wed, 28 Jul 2010 20:59:36 +0000 (13:59 -0700)
committer	Brian Aker <brian@gaz>
	Wed, 28 Jul 2010 20:59:36 +0000 (13:59 -0700)
		1	2
clients/memstat.c	patch \|	diff1 \|	diff2 \|	blob \| history
clients/utilities.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/mem_functions.c	patch \|	diff1 \|	diff2 \|	blob \| history
tests/server.c	patch \|	diff1 \|	diff2 \|	blob \| history