Merge commit 'origin/master' into vm

Conflicts:

	doc/Makefile.am
	ice-9/Makefile.am
	libguile/gc.c

guile-readline/.cvsignore

@@ -1,24 +0,0 @@
-*.c.clean.c
-*.la
-*.lo
-*.x
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.log
-config.status
-config.sub
-configure
-depcomp
-guile-readline-config.h
-guile-readline-config.h.in
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-stamp-h1

guile-readline/Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with Automake to create Makefile.in
 ##
-##  	Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007 Free Software Foundation, Inc.
+##  	Copyright (C) 1998, 1999, 2000, 2001, 2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -48,7 +48,7 @@ SUFFIXES = .x
 .c.x:
 	$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
 
-EXTRA_DIST = LIBGUILEREADLINE-VERSION
+EXTRA_DIST = LIBGUILEREADLINE-VERSION ChangeLog-2008
 
 MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 

guile-readline/ice-9/.cvsignore

@@ -1,2 +0,0 @@
-Makefile
-Makefile.in

guile-readline/readline.c

@@ -27,7 +27,6 @@
 
 #ifdef HAVE_RL_GETC_FUNCTION
 #include "libguile.h"
-#include "libguile/gh.h"
 #include "libguile/iselect.h"
 
 #include <stdio.h>