Merge from trunk

author Robert Millan <rmh@aybabtu.com>

Sun, 13 Dec 2009 18:41:21 +0000 (18:41 +0000)

committer Robert Millan <rmh@aybabtu.com>

Sun, 13 Dec 2009 18:41:21 +0000 (18:41 +0000)
author Robert Millan <rmh@aybabtu.com>
Sun, 13 Dec 2009 18:41:21 +0000 (18:41 +0000)
committer Robert Millan <rmh@aybabtu.com>
Sun, 13 Dec 2009 18:41:21 +0000 (18:41 +0000)
diff --cc gendistlist.sh

index 36685a092cd6fb3d48856f22ede96b66f39bb3b5,43366bd7314fd6dbfc122ca8963d9d845051afe3..43366bd7314fd6dbfc122ca8963d9d845051afe3

mode 100755,100644..100755
--- 1/gendistlist.sh
--- 2/gendistlist.sh
+++ b/gendistlist.sh
diff --cc genmk.rb
Simple merge
author	Robert Millan <rmh@aybabtu.com>
	Sun, 13 Dec 2009 18:41:21 +0000 (18:41 +0000)
committer	Robert Millan <rmh@aybabtu.com>
	Sun, 13 Dec 2009 18:41:21 +0000 (18:41 +0000)
		1	2
gendistlist.sh	patch \|	diff1 \|	diff2 \|	blob \| history
genmk.rb	patch \|	diff1 \|	diff2 \|	blob \| history