Automated merge.

author Micah Cowan <micah@cowan.name>

Sun, 13 Apr 2008 06:21:09 +0000 (23:21 -0700)

committer Micah Cowan <micah@cowan.name>

Sun, 13 Apr 2008 06:21:09 +0000 (23:21 -0700)
author Micah Cowan <micah@cowan.name>
Sun, 13 Apr 2008 06:21:09 +0000 (23:21 -0700)
committer Micah Cowan <micah@cowan.name>
Sun, 13 Apr 2008 06:21:09 +0000 (23:21 -0700)
diff --cc src/ChangeLog
Simple merge
diff --cc src/utils.c
Simple merge
author	Micah Cowan <micah@cowan.name>
	Sun, 13 Apr 2008 06:21:09 +0000 (23:21 -0700)
committer	Micah Cowan <micah@cowan.name>
	Sun, 13 Apr 2008 06:21:09 +0000 (23:21 -0700)
		1	2
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/utils.c	patch \|	diff1 \|	diff2 \|	blob \| history