Merge tree from intel box.

author Brian Aker <brian@tangent.org>

Sun, 28 Apr 2013 06:53:51 +0000 (02:53 -0400)

committer Brian Aker <brian@tangent.org>

Sun, 28 Apr 2013 06:53:51 +0000 (02:53 -0400)
author Brian Aker <brian@tangent.org>
Sun, 28 Apr 2013 06:53:51 +0000 (02:53 -0400)
committer Brian Aker <brian@tangent.org>
Sun, 28 Apr 2013 06:53:51 +0000 (02:53 -0400)
diff --cc bootstrap.sh
Simple merge
diff --cc configure.ac
Simple merge
author	Brian Aker <brian@tangent.org>
	Sun, 28 Apr 2013 06:53:51 +0000 (02:53 -0400)
committer	Brian Aker <brian@tangent.org>
	Sun, 28 Apr 2013 06:53:51 +0000 (02:53 -0400)
		1	2
bootstrap.sh	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history