Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Fri, 2 Dec 2011 11:00:33 +0000 (12:00 +0100)
committerAndy Wingo <wingo@pobox.com>
Fri, 2 Dec 2011 11:00:33 +0000 (12:00 +0100)
commitea0582c283c29e40f1eb1e85821a9c46bc386121
treeafb55074f3819d348c8371c72cc2f369e7e42572
parentb2208d2e987759270c712e35c8164394a47a52aa
parentb57bf2724a254cf73e255b3d2bca0a7dcad6674a
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/guile.c
libguile/numbers.c
libguile/guile.c
libguile/numbers.c
libguile/numbers.h