Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:15:34 +0000 (22:15 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:15:34 +0000 (22:15 -0700)
commit333d54dade1e7005d5a97612907158fe5ec3d310
treea5b18c9c6a68d71fddae98aba0d81079068a8c46
parent90856fe0b82ba19d1c3d73a4ba48007380201e66
parent620c53a664e41788f6d4f8e3f687e1a0d448b857
Merge from trunk.
src/ChangeLog
src/alloc.c
src/lisp.h