Merge remote-tracking branch 'origin/stable-2.0'

author Andy Wingo <wingo@pobox.com>

Thu, 28 Apr 2011 13:53:35 +0000 (15:53 +0200)

committer Andy Wingo <wingo@pobox.com>

Thu, 28 Apr 2011 13:53:35 +0000 (15:53 +0200)
author Andy Wingo <wingo@pobox.com>
Thu, 28 Apr 2011 13:53:35 +0000 (15:53 +0200)
committer Andy Wingo <wingo@pobox.com>
Thu, 28 Apr 2011 13:53:35 +0000 (15:53 +0200)
diff --cc .gitignore
Simple merge
diff --cc GUILE-VERSION
Simple merge
diff --cc configure.ac
Simple merge
author	Andy Wingo <wingo@pobox.com>
	Thu, 28 Apr 2011 13:53:35 +0000 (15:53 +0200)
committer	Andy Wingo <wingo@pobox.com>
	Thu, 28 Apr 2011 13:53:35 +0000 (15:53 +0200)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
GUILE-VERSION	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history