Merge from trunk
commit7a600d54c026061eee6db4e499802f524e7ebe00
authorStefan Monnier <monnier@iro.umontreal.ca>
Mon, 13 Dec 2010 04:11:49 +0000 (12 23:11 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Mon, 13 Dec 2010 04:11:49 +0000 (12 23:11 -0500)
tree684aa988f06de977a52027ee5e1262c37f7678eb
parentf07a954eeb0930029104402e706165bf89853576
parentfdbb4d85ffa2ac30cb7ac0ceea6f12d0c8054d6c
Merge from trunk
lisp/ChangeLog.trunk
src/ChangeLog.trunk
src/eval.c