Merge branch 'master' into next

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

Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)

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

Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)
author William Morgan <wmorgan-sup@masanjin.net>
Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)
committer William Morgan <wmorgan-sup@masanjin.net>
Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)
diff --cc Rakefile
Simple merge
diff --cc lib/sup.rb
Simple merge
author	William Morgan <wmorgan-sup@masanjin.net>
	Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)
committer	William Morgan <wmorgan-sup@masanjin.net>
	Wed, 16 Jan 2008 03:06:48 +0000 (19:06 -0800)
		1	2
Rakefile	patch \|	diff1 \|	diff2 \|	blob \| history
lib/sup.rb	patch \|	diff1 \|	diff2 \|	blob \| history