Merge remote-tracking branch 'local-2.0/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Thu, 2 Jun 2011 20:49:33 +0000 (22:49 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 2 Jun 2011 20:49:33 +0000 (22:49 +0200)
commit46da7909e1f67c13284730344e971d293df890c0
tree5acc96a0834b5d9be7df59ef5a126ccfb8f53a8c
parent6fc3eae4772bc2c5dc3e2b377ca481eef9aa52f5
parent715146aa15982b0d38b242f7811ac64addeb7ecc
Merge remote-tracking branch 'local-2.0/stable-2.0'

Conflicts:
meta/Makefile.am
.gitignore
configure.ac
libguile/_scm.h
libguile/objcodes.c
meta/Makefile.am