Merge branch 'preemptive-loading' into next

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

Thu, 3 Sep 2009 17:53:47 +0000 (13:53 -0400)

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

Thu, 3 Sep 2009 17:53:47 +0000 (13:53 -0400)
author William Morgan <wmorgan-sup@masanjin.net>
Thu, 3 Sep 2009 17:53:47 +0000 (13:53 -0400)
committer William Morgan <wmorgan-sup@masanjin.net>
Thu, 3 Sep 2009 17:53:47 +0000 (13:53 -0400)
diff --cc bin/sup
Simple merge
diff --cc lib/sup/modes/thread-index-mode.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Thu, 3 Sep 2009 17:53:47 +0000 (13:53 -0400)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Thu, 3 Sep 2009 17:53:47 +0000 (13:53 -0400)
		1	2
bin/sup	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup/modes/thread-index-mode.rb	patch \|	diff1 \|	diff2 \|	blob \| history