Merged in dachary/jerasure/wip-make-check (pull request #16)

author Kevin Greenan <kmgreen2@gmail.com>

Thu, 3 Apr 2014 23:39:03 +0000 (16:39 -0700)

committer Kevin Greenan <kmgreen2@gmail.com>

Thu, 3 Apr 2014 23:39:03 +0000 (16:39 -0700)
author Kevin Greenan <kmgreen2@gmail.com>
Thu, 3 Apr 2014 23:39:03 +0000 (16:39 -0700)
committer Kevin Greenan <kmgreen2@gmail.com>
Thu, 3 Apr 2014 23:39:03 +0000 (16:39 -0700)
diff --cc Examples/Makefile.am
Simple merge
diff --cc README
Simple merge
author	Kevin Greenan <kmgreen2@gmail.com>
	Thu, 3 Apr 2014 23:39:03 +0000 (16:39 -0700)
committer	Kevin Greenan <kmgreen2@gmail.com>
	Thu, 3 Apr 2014 23:39:03 +0000 (16:39 -0700)
		1	2
Examples/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
README	patch \|	diff1 \|	diff2 \|	blob \| history