Merge branch 'stable-2.0'

Conflicts:
	libguile/pairs.c
	libguile/vm.c
	test-suite/tests/control.test

diff --cc configure.ac
Simple merge

diff --cc libguile/pairs.c
index 1a3c5a1,7d7e68c..764458e
--- 1/libguile/pairs.c
--- 2/libguile/pairs.c
+++ b/libguile/pairs.c
@@@ -1,4 -1,5 +1,5 @@@
- /* Copyright (C) 1995,1996,2000,2001, 2004, 2005, 2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+ /* Copyright (C) 1995,1996,2000,2001, 2004, 2005, 2006, 2008, 2009,
 - *   2011, 2013 Free Software Foundation, Inc.
++ *   2011, 2012, 2013 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
@@@ -131,7 -144,22 +132,8 @@@ SCM_DEFINE (scm_set_cdr_x, "set-cdr!", 
    return tree
  
  
 -SCM_DEFINE (scm_cdr, "cdr", 1, 0, 0, (SCM x), "")
 -#define FUNC_NAME s_scm_cdr
 -{
 -  CHASE_PAIRS (x, "cdr", 0x02); /* 00000010 */
 -}
 -#undef FUNC_NAME
 -
 -SCM_DEFINE (scm_car, "car", 1, 0, 0, (SCM x), "")
 -#define FUNC_NAME s_scm_car
 -{
 -  CHASE_PAIRS (x, "car", 0x03); /* 00000011 */
 -}
 -#undef FUNC_NAME
 -
  SCM_DEFINE (scm_cddr, "cddr", 1, 0, 0, (SCM x), "")
+ #define FUNC_NAME s_scm_cddr
  {
    CHASE_PAIRS (x, "cddr", 0x0a); /* 00001010 */
  }