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

author Mark H Weaver <mhw@netris.org>

Thu, 18 Jul 2013 19:31:34 +0000 (15:31 -0400)

committer Mark H Weaver <mhw@netris.org>

Thu, 18 Jul 2013 19:31:34 +0000 (15:31 -0400)
author Mark H Weaver <mhw@netris.org>
Thu, 18 Jul 2013 19:31:34 +0000 (15:31 -0400)
committer Mark H Weaver <mhw@netris.org>
Thu, 18 Jul 2013 19:31:34 +0000 (15:31 -0400)
diff --cc libguile/_scm.h
Simple merge
diff --cc libguile/tags.h
Simple merge
author	Mark H Weaver <mhw@netris.org>
	Thu, 18 Jul 2013 19:31:34 +0000 (15:31 -0400)
committer	Mark H Weaver <mhw@netris.org>
	Thu, 18 Jul 2013 19:31:34 +0000 (15:31 -0400)
		1	2
libguile/_scm.h	patch \|	diff1 \|	diff2 \|	blob \| history
libguile/tags.h	patch \|	diff1 \|	diff2 \|	blob \| history