Merge in dist fix from Monty

author Brian Aker <brian@tangent.org>

Tue, 22 Feb 2011 02:09:08 +0000 (18:09 -0800)

committer Brian Aker <brian@tangent.org>

Tue, 22 Feb 2011 02:09:08 +0000 (18:09 -0800)
author Brian Aker <brian@tangent.org>
Tue, 22 Feb 2011 02:09:08 +0000 (18:09 -0800)
committer Brian Aker <brian@tangent.org>
Tue, 22 Feb 2011 02:09:08 +0000 (18:09 -0800)
diff --cc Makefile.am
Simple merge
diff --cc tests/include.am
Simple merge
author	Brian Aker <brian@tangent.org>
	Tue, 22 Feb 2011 02:09:08 +0000 (18:09 -0800)
committer	Brian Aker <brian@tangent.org>
	Tue, 22 Feb 2011 02:09:08 +0000 (18:09 -0800)
		1	2
Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
tests/include.am	patch \|	diff1 \|	diff2 \|	blob \| history