Merge commit 'd10f7b572c0ca1ccef87f9c46069daa30946e0cf'
authorAndy Wingo <wingo@pobox.com>
Thu, 26 Apr 2012 20:17:47 +0000 (22:17 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 26 Apr 2012 20:17:47 +0000 (22:17 +0200)
commite7501d4a682cc2b430514280834dfc68b97f2be2
treeff1ba27f86e7c1e896657acc633aa5cf59ddfd63
parent649d3ea76639424fa5445a6f44896de1fdf1e309
parentd10f7b572c0ca1ccef87f9c46069daa30946e0cf
Merge commit 'd10f7b572c0ca1ccef87f9c46069daa30946e0cf'

Conflicts:
libguile/smob.c
libguile/smob.h
test-suite/tests/tree-il.test
libguile/Makefile.am
libguile/bytevectors.c
libguile/strings.c
test-suite/Makefile.am
test-suite/tests/asm-to-bytecode.test
test-suite/tests/tree-il.test