Merge remote-tracking branch 'local-2.0/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Thu, 10 May 2012 11:02:11 +0000 (13:02 +0200)
committerAndy Wingo <wingo@pobox.com>
Thu, 10 May 2012 11:02:11 +0000 (13:02 +0200)
commit968a9add65c5e3a33ab9f5b7697051c5b9282060
treef793baeb1f36037956c161c0ddc168fdbe5ec387
parenta3ded46520b35a8dbda22097b74792b8282d12ce
parent67b699cc77d5e2f74daca77aa26b1ba8af0d0808
Merge remote-tracking branch 'local-2.0/stable-2.0'

Conflicts:
libguile/vm-engine.c
libguile/vm-i-system.c
libguile/vm.c
libguile/frames.c
libguile/vm-engine.c
libguile/vm-i-system.c
libguile/vm.c