Merge from trunk.
commit615a3b8d0d2c88cd664f1e0beb5a32b5b8e08f90
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 03:07:02 +0000 (19 19:07 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 20 Nov 2011 03:07:02 +0000 (19 19:07 -0800)
treee0458a9eac443c36a3a4bfa117fde01bbd6e4140
parentc3ca24d48c10fb771ee02eb58f7d49bd82d6306e
parente1dbe924b53c541fdf238a5a722b7177d5c8760b
Merge from trunk.
src/ChangeLog
src/alloc.c
src/lisp.h