Merge branch 'dlload-bugfix' into next

author William Morgan <wmorgan-sup@masanjin.net>

Thu, 9 Apr 2009 19:29:19 +0000 (15:29 -0400)

committer William Morgan <wmorgan-sup@masanjin.net>

Thu, 9 Apr 2009 19:29:19 +0000 (15:29 -0400)
author William Morgan <wmorgan-sup@masanjin.net>
Thu, 9 Apr 2009 19:29:19 +0000 (15:29 -0400)
committer William Morgan <wmorgan-sup@masanjin.net>
Thu, 9 Apr 2009 19:29:19 +0000 (15:29 -0400)
diff --cc bin/sup
Simple merge
diff --cc lib/sup.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Thu, 9 Apr 2009 19:29:19 +0000 (15:29 -0400)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Thu, 9 Apr 2009 19:29:19 +0000 (15:29 -0400)
		1	2
bin/sup	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup.rb	patch \|	diff1 \|	diff2 \|	blob \| history