Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Mon, 5 Nov 2012 20:57:03 +0000 (15:57 -0500)
committerMark H Weaver <mhw@netris.org>
Mon, 5 Nov 2012 20:57:03 +0000 (15:57 -0500)
commitfd57bbf5ac7c790f0731b1a44c7d20f469403009
tree1af4a0bdf2c4183c9370688cca9cfdbedad56e10
parentd628c078cc8e2ccddbcab74346733486f7cf27e8
parent02a362a665ce462e4fe2409b2e2fc2c0007360f2
Merge remote-tracking branch 'origin/stable-2.0'

Conflicts:
libguile/validate.h
libguile/threads.c
libguile/validate.h