Merge remote-tracking branch 'origin/stable-2.0'
authorAndy Wingo <wingo@pobox.com>
Sun, 25 Mar 2012 22:56:29 +0000 (00:56 +0200)
committerAndy Wingo <wingo@pobox.com>
Sun, 25 Mar 2012 22:56:29 +0000 (00:56 +0200)
commitc8ab29ac8e32f3f68efe1652e27d4a4cb2d90f4e
treef40e9c3c0ffaa34c35dd80f29c46bda1f920c1d6
parent01e909d90a130f4987b70edae2dbd5a2b33edae7
parenta8004dcb4d7148ec66cbaa109a18715d757700eb
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/procprop.c
libguile/smob.c
libguile/smob.h
libguile/vm.c
module/language/tree-il/primitives.scm
module/language/tree-il/primitives.scm
test-suite/tests/tree-il.test