Merge branch 'labels-rework' into next

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

Sun, 29 Mar 2009 16:25:40 +0000 (12:25 -0400)

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

Sun, 29 Mar 2009 16:25:40 +0000 (12:25 -0400)
author William Morgan <wmorgan-sup@masanjin.net>
Sun, 29 Mar 2009 16:25:40 +0000 (12:25 -0400)
committer William Morgan <wmorgan-sup@masanjin.net>
Sun, 29 Mar 2009 16:25:40 +0000 (12:25 -0400)
diff --cc bin/sup
Simple merge
diff --cc lib/sup/buffer.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Sun, 29 Mar 2009 16:25:40 +0000 (12:25 -0400)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Sun, 29 Mar 2009 16:25:40 +0000 (12:25 -0400)
		1	2
bin/sup	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup/buffer.rb	patch \|	diff1 \|	diff2 \|	blob \| history