Merge commit 'dc65b88d839c326889618112c4870ad3a64e9446'

Conflicts:
	libguile/srfi-4.c

diff --cc libguile/srfi-4.c
index c45519b,7b25a3b..d8a264c
--- 1/libguile/srfi-4.c
--- 2/libguile/srfi-4.c
+++ b/libguile/srfi-4.c
@@@ -1,6 -1,6 +1,6 @@@
  /* srfi-4.c --- Uniform numeric vector datatypes.
   *
-  *    Copyright (C) 2001, 2004, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 - *    Copyright (C) 2001, 2004, 2006, 2009, 2010, 2014 Free Software Foundation, Inc.
++ *    Copyright (C) 2001, 2004, 2006, 2009, 2010, 2011, 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