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

Conflicts:
	.gitignore
	doc/example-smob/Makefile
	doc/ref/api-smobs.texi
	doc/ref/libguile-concepts.texi
	doc/ref/libguile-smobs.texi
	libguile.h
	libguile/finalizers.c
	libguile/finalizers.h
	libguile/goops.c
	module/language/tree-il/compile-glil.scm
	module/oop/goops.scm

diff --cc .gitignore
index 12cbc32,3deeab2..6375f2b
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -160,4 -160,5 +160,6 @@@ INSTAL
  /test-suite/standalone/test-scm-values
  /test-suite/standalone/test-scm-to-latin1-string
  /test-suite/standalone/test-scm-c-bind-keyword-arguments
 +/libguile/vm-operations.h
+ /test-suite/standalone/test-foreign-object-c
+ /test-suite/standalone/test-srfi-4

diff --cc doc/ref/Makefile.am
Simple merge

diff --cc doc/ref/api-control.texi
Simple merge

diff --cc doc/ref/api-memory.texi
Simple merge

diff --cc doc/ref/guile.texi
Simple merge

diff --cc doc/ref/libguile-concepts.texi
index 0103ad1,ea2bdbe..9e2eb75
--- 1/doc/ref/libguile-concepts.texi
--- 2/doc/ref/libguile-concepts.texi
+++ b/doc/ref/libguile-concepts.texi
@@@ -1,7 -1,7 +1,7 @@@
  @c -*-texinfo-*-
  @c This is part of the GNU Guile Reference Manual.
 -@c Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2013, 2014
 -@c   Free Software Foundation, Inc.
 +@c Copyright (C)  1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010,
- @c   2011, 2013  Free Software Foundation, Inc.
++@c   2011, 2013, 2014  Free Software Foundation, Inc.
  @c See the file guile.texi for copying conditions.
  
  @node General Libguile Concepts

diff --cc libguile.h
index b067b28,48548c3..4904d69
--- 1/libguile.h
--- 2/libguile.h
+++ b/libguile.h
@@@ -1,7 -1,7 +1,7 @@@
  #ifndef SCM_LIBGUILE_H
  #define SCM_LIBGUILE_H
  
- /* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 -/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
++/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2002, 2003, 2004, 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
   * 
   * This library is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public License
@@@ -52,8 -52,10 +52,9 @@@ extern "C" 
  #include "libguile/finalizers.h"
  #include "libguile/fluids.h"
  #include "libguile/foreign.h"
+ #include "libguile/foreign-object.h"
  #include "libguile/fports.h"
  #include "libguile/gc.h"
 -#include "libguile/gdbint.h"
  #include "libguile/generalized-arrays.h"
  #include "libguile/generalized-vectors.h"
  #include "libguile/goops.h"

diff --cc libguile/Makefile.am
Simple merge

diff --cc libguile/goops.c
Simple merge

diff --cc libguile/init.c
Simple merge

diff --cc module/Makefile.am
index abc8a73,521318b..7af35ed
--- 1/module/Makefile.am
--- 2/module/Makefile.am
+++ b/module/Makefile.am
@@@ -377,10 -359,9 +377,11 @@@ SYSTEM_SOURCES =                         
    system/vm/trace.scm                         \
    system/vm/traps.scm                         \
    system/vm/trap-state.scm                    \
 +  system/vm/debug.scm                         \
 +  system/vm/disassembler.scm                  \
    system/vm/vm.scm                            \
    system/foreign.scm                          \
+   system/foreign-object.scm                   \
    system/xref.scm                             \
    system/repl/debug.scm                               \
    system/repl/error-handling.scm              \

diff --cc test-suite/standalone/Makefile.am
Simple merge