Merge commit '53d81399bef1d9396665e79fb6b9c25eb8e2a6ad' into vm-check
authorAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 14:59:40 +0000 (15:59 +0100)
committerAndy Wingo <wingo@oblong.net>
Tue, 17 Mar 2009 14:59:40 +0000 (15:59 +0100)
commitdf22662f5de5585f723943a44e61fb71f7a49190
treeb5efdff7b7bef3b364cb2ed13ce6222fc7d8989d
parent3924b91748c9e449a27bc26847be6c20b4dd9f82
parent53d81399bef1d9396665e79fb6b9c25eb8e2a6ad
Merge commit '53d81399bef1d9396665e79fb6b9c25eb8e2a6ad' into vm-check

Also cherry-picks the changes from 1405f1b60fa178303484cd428068ecd01ff6d322

Conflicts:

module/ice-9/session.scm
module/ice-9/session.scm