Merge branch 'bin-lib-versions'

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

Tue, 22 Jan 2008 20:16:29 +0000 (12:16 -0800)

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

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